summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2014-05-20 06:01:34 -0600
committerMinkyu Kang <mk7.kang@samsung.com>2014-05-28 10:58:18 +0900
commit913702ca397755e06fcc126a063ebbf814ac869b (patch)
tree5942d93b8d4ff1c03708df38225dd364b1b0326e /drivers
parent2f7547ff27b684ddcee30e985a0dea3843449e0a (diff)
downloadblackbird-obmc-uboot-913702ca397755e06fcc126a063ebbf814ac869b.tar.gz
blackbird-obmc-uboot-913702ca397755e06fcc126a063ebbf814ac869b.zip
power: Rename CONFIG_PMIC_... to CONFIG_POWER_...
Commit be3b51aa did this mostly, but several have been added since. Do the job again. Signed-off-by: Simon Glass <sjg@chromium.org> Acked-by: Lukasz Majewski <l.majewski@samsung.com> Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/power/power_fsl.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index ac0b541d79..a64161b243 100644
--- 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
@@ -51,7 +51,7 @@ int pmic_init(unsigned char bus)
p->hw.i2c.addr = CONFIG_SYS_FSL_PMIC_I2C_ADDR;
p->hw.i2c.tx_num = FSL_PMIC_I2C_LENGTH;
#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;
OpenPOWER on IntegriCloud