bfin: Move gpio support for bf54x and bf60x into the generic driver folder.

[u-boot] / drivers / power / power_fsl.c

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index 0275fd9891aacea35cc9a51c53de48a9de029b8a..a663831589fdfe05a5756c592cd4ae5fcfc0fd6e 100644 (file)
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -27,7 +27,13 @@
 #include <fsl_pmic.h>
 #include <errno.h>
 
-#if defined(CONFIG_PMIC_SPI)
+#if defined(CONFIG_PMIC_FSL_MC13892)
+#define FSL_PMIC_I2C_LENGTH    3
+#elif defined(CONFIG_PMIC_FSL_MC34704)
+#define FSL_PMIC_I2C_LENGTH    1
+#endif
+
+#if defined(CONFIG_POWER_SPI)
 static u32 pmic_spi_prepare_tx(u32 reg, u32 *val, u32 write)
 {
        return (write << 31) | (reg << 25) | (*val & 0x00FFFFFF);
@@ -47,7 +53,7 @@ int pmic_init(unsigned char bus)
        p->name = name;
        p->number_of_regs = PMIC_NUM_OF_REGS;
 
-#if defined(CONFIG_PMIC_SPI)
+#if defined(CONFIG_POWER_SPI)
        p->interface = PMIC_SPI;
        p->bus = CONFIG_FSL_PMIC_BUS;
        p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
@@ -56,13 +62,13 @@ int pmic_init(unsigned char bus)
        p->hw.spi.bitlen = CONFIG_FSL_PMIC_BITLEN;
        p->hw.spi.flags = SPI_XFER_BEGIN | SPI_XFER_END;
        p->hw.spi.prepare_tx = pmic_spi_prepare_tx;
-#elif defined(CONFIG_PMIC_I2C)
+#elif defined(CONFIG_POWER_I2C)
        p->interface = PMIC_I2C;
        p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
-       p->hw.i2c.tx_num = 3;
+       p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
        p->bus = bus;
 #else
-#error "You must select CONFIG_PMIC_SPI or CONFIG_PMIC_I2C"
+#error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C"
 #endif
 
        return 0;