diff mbox

[1/5] ARM: Exynos5250: rename obsoleted CONFIG_PMIC defines

Message ID 1380105759-9687-2-git-send-email-andre.przywara@linaro.org
State New
Headers show

Commit Message

Andre Przywara Sept. 25, 2013, 10:42 a.m. UTC 
Commit be3b51aa4a450f3e3fcd9c6e5074ef435812a02d renamed CONFIG_PMIC
to CONFIG_POWER, but somehow the old values survived or sneaked in
again.
Removed the redundant and useless version in exynos5250-dt.h and
rename it in arndale.h.

Signed-off-by: Andre Przywara <andre.przywara@linaro.org>
---
 drivers/power/power_fsl.c       | 2 +-
 include/configs/arndale.h       | 6 +++---
 include/configs/exynos5250-dt.h | 5 -----
 3 files changed, 4 insertions(+), 9 deletions(-)
diff mbox

Patch

diff --git a/drivers/power/power_fsl.c b/drivers/power/power_fsl.c
index ed778f3..7fb233d 100644
--- a/drivers/power/power_fsl.c
+++ b/drivers/power/power_fsl.c
@@ -52,7 +52,7 @@  int pmic_init(unsigned char bus)
 	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"
 #endif
 
 	return 0;
diff --git a/include/configs/arndale.h b/include/configs/arndale.h
index ed44a04..f9eb051 100644
--- a/include/configs/arndale.h
+++ b/include/configs/arndale.h
@@ -226,9 +226,9 @@ 
 #define CONFIG_I2C_EDID
 
 /* PMIC */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_I2C
-#define CONFIG_PMIC_MAX77686
+#define CONFIG_POWER
+#define CONFIG_POWER_I2C
+#define CONFIG_POWER_MAX77686
 
 #define CONFIG_DEFAULT_DEVICE_TREE	exynos5250-arndale
 
diff --git a/include/configs/exynos5250-dt.h b/include/configs/exynos5250-dt.h
index 8c21909..14d62e4 100644
--- a/include/configs/exynos5250-dt.h
+++ b/include/configs/exynos5250-dt.h
@@ -257,11 +257,6 @@ 
 #define CONFIG_SYS_I2C_SLAVE    0x0
 #define CONFIG_I2C_EDID
 
-/* PMIC */
-#define CONFIG_PMIC
-#define CONFIG_PMIC_I2C
-#define CONFIG_PMIC_MAX77686
-
 /* SPI */
 #define CONFIG_ENV_IS_IN_SPI_FLASH
 #define CONFIG_SPI_FLASH