clk: rename CONFIG_SPL_CLK_SUPPORT to CONFIG_SPL_CLK

[karo-tx-uboot.git] / drivers / power / power_fsl.c

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index ed778f333e5387d3e85a4544557a8fabfb20962a..a64161b24301b7f9e17061f3570ad572b274d165 100644 (file)
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -11,9 +11,9 @@
 #include <fsl_pmic.h>
 #include <errno.h>
 
-#if defined(CONFIG_PMIC_FSL_MC13892)
+#if defined(CONFIG_POWER_FSL_MC13892)
 #define FSL_PMIC_I2C_LENGTH    3
-#elif defined(CONFIG_PMIC_FSL_MC34704)
+#elif defined(CONFIG_POWER_FSL_MC34704)
 #define FSL_PMIC_I2C_LENGTH    1
 #endif
 
@@ -36,10 +36,10 @@ int pmic_init(unsigned char bus)
 
        p->name = name;
        p->number_of_regs = PMIC_NUM_OF_REGS;
+       p->bus = bus;
 
 #if defined(CONFIG_POWER_SPI)
        p->interface = PMIC_SPI;
-       p->bus = CONFIG_FSL_PMIC_BUS;
        p->hw.spi.cs = CONFIG_FSL_PMIC_CS;
        p->hw.spi.clk = CONFIG_FSL_PMIC_CLK;
        p->hw.spi.mode = CONFIG_FSL_PMIC_MODE;
@@ -50,9 +50,8 @@ int pmic_init(unsigned char bus)
        p->interface = PMIC_I2C;
        p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
        p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
-       p->bus = bus;
 #else
-#error "You must select CONFIG_POWER_SPI or CONFIG_PMIC_I2C"
+#error "You must select CONFIG_POWER_SPI or CONFIG_POWER_I2C"
 #endif
 
        return 0;