power: Rename CONFIG_POWER to CONFIG_POWER_LEGACY

This option is used in pre-driver model code and much of it has never
been converted to driver model.

We want to add a new option to enable power support, so we can use a
simple rule in the Makefile. Rename this one, which is really about
a particular implementation of power.

Also update the pmic.h header file so it either includes the legacy
API or the driver model one.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>

diff --git a/board/compulab/cl-som-imx7/cl-som-imx7.c b/board/compulab/cl-som-imx7/cl-som-imx7.c
index 454c93a572f8b4895eb2c638a0080d0c4d31b7fb..c54e02fdb44d13212e6f667fc86ec49fb01f9861 100644 (file)
--- a/board/compulab/cl-som-imx7/cl-som-imx7.c
+++ b/board/compulab/cl-som-imx7/cl-som-imx7.c
@@ -267,7 +267,7 @@ int board_init(void)
        return 0;
 }
 
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
 #define I2C_PMIC       0
 int power_init_board(void)
 {
@@ -293,7 +293,7 @@ int power_init_board(void)
 
        return 0;
 }
-#endif /* CONFIG_POWER */
+#endif /* CONFIG_POWER_LEGACY */
 
 /*
  * cl_som_imx7_setup_wdog() - watchdog configuration.

diff --git a/board/freescale/imx8mp_evk/spl.c b/board/freescale/imx8mp_evk/spl.c
index a7564e9b1ae273bb8697fb1d15c90e92e188f1f4..d317f212973ac7da6c0abdf9e1d069b9f34c8e3c 100644 (file)
--- a/board/freescale/imx8mp_evk/spl.c
+++ b/board/freescale/imx8mp_evk/spl.c
@@ -63,7 +63,7 @@ struct i2c_pads_info i2c_pad_info1 = {
        },
 };
 
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
 #define I2C_PMIC       0
 int power_init_board(void)
 {

diff --git a/board/freescale/imx8mq_evk/spl.c b/board/freescale/imx8mq_evk/spl.c
index e8e0efe485574689eafd176bc383e6b3c239ad0a..6ee6230f74824085487d5993edcf1549faba5ed1 100644 (file)
--- a/board/freescale/imx8mq_evk/spl.c
+++ b/board/freescale/imx8mq_evk/spl.c
@@ -156,7 +156,7 @@ int board_mmc_init(struct bd_info *bis)
        return 0;
 }
 
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
 #define I2C_PMIC       0
 int power_init_board(void)
 {

diff --git a/board/samsung/common/board.c b/board/samsung/common/board.c
index 1c2fe025e89c2d7a8e776816cc4ea8e23e759d94..08f9202b71165e084022d561f05b492edc8d088c 100644 (file)
--- a/board/samsung/common/board.c
+++ b/board/samsung/common/board.c
@@ -185,7 +185,7 @@ int board_early_init_f(void)
 }
 #endif
 
-#if defined(CONFIG_POWER) || defined(CONFIG_DM_PMIC)
+#if defined(CONFIG_POWER_LEGACY) || defined(CONFIG_DM_PMIC)
 int power_init_board(void)
 {
        set_ps_hold_ctrl();

diff --git a/board/technexion/pico-imx7d/pico-imx7d.c b/board/technexion/pico-imx7d/pico-imx7d.c
index 2d749dac19a460f28c8b01fef42e9baf4aef0fdc..81b1fb3512200c89b5ba695e7bea332b040558a4 100644 (file)
--- a/board/technexion/pico-imx7d/pico-imx7d.c
+++ b/board/technexion/pico-imx7d/pico-imx7d.c
@@ -60,7 +60,7 @@ int dram_init(void)
        return 0;
 }
 
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
 #define I2C_PMIC       3
 int power_init_board(void)
 {

diff --git a/board/tqc/tqma6/tqma6.c b/board/tqc/tqma6/tqma6.c
index 0d8229d11239903ad04a2a48745625a4f214c727..f851e1948cf7826713ae46937ffde5f1517d5417 100644 (file)
--- a/board/tqc/tqma6/tqma6.c
+++ b/board/tqc/tqma6/tqma6.c
@@ -247,7 +247,7 @@ static const char *tqma6_get_boardname(void)
        };
 }
 
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
 /* setup board specific PMIC */
 int power_init_board(void)
 {

diff --git a/board/udoo/neo/neo.c b/board/udoo/neo/neo.c
index 92a1e084b5242f81caf088a0863ec763bedb9f57..88889df2d2fda5b283dd7071189e02cdfbb474be 100644 (file)
--- a/board/udoo/neo/neo.c
+++ b/board/udoo/neo/neo.c
@@ -96,7 +96,7 @@ static struct i2c_pads_info i2c_pad_info1 = {
 };
 #endif
 
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
 int power_init_board(void)
 {
        struct pmic *p;

diff --git a/drivers/power/Makefile b/drivers/power/Makefile
index 0bef06920a7dcaca64de8e56b33bac42bdb2b770..ab52bc1582c78c6d8ec06254be92163f8e7567bb 100644 (file)
--- a/drivers/power/Makefile
+++ b/drivers/power/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_TPS6586X_POWER)  += tps6586x.o
 obj-$(CONFIG_TWL4030_POWER)    += twl4030.o
 obj-$(CONFIG_TWL6030_POWER)    += twl6030.o
 obj-$(CONFIG_PALMAS_POWER)     += palmas.o
-obj-$(CONFIG_POWER) += power_core.o
+obj-$(CONFIG_POWER_LEGACY) += power_core.o
 obj-$(CONFIG_DIALOG_POWER) += power_dialog.o
 obj-$(CONFIG_POWER_FSL) += power_fsl.o
 obj-$(CONFIG_POWER_I2C) += power_i2c.o

diff --git a/drivers/power/regulator/Makefile b/drivers/power/regulator/Makefile
index 677134c822ccc8fad7f79399c2ee8195c9bb0cf6..4efb32a322825370a4375497f25d87d118cb6d8f 100644 (file)
--- a/drivers/power/regulator/Makefile
+++ b/drivers/power/regulator/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_$(SPL_)DM_REGULATOR_FAN53555) += fan53555.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_COMMON) += regulator_common.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_FIXED) += fixed.o
 obj-$(CONFIG_$(SPL_)DM_REGULATOR_GPIO) += gpio-regulator.o
-obj-$(CONFIG_REGULATOR_RK8XX) += rk8xx.o
+obj-$(CONFIG_$(SPL_TPL_)REGULATOR_RK8XX) += rk8xx.o
 obj-$(CONFIG_DM_REGULATOR_S2MPS11) += s2mps11_regulator.o
 obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
 obj-$(CONFIG_DM_REGULATOR_SANDBOX) += sandbox.o

diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
index 83fc00de31f54fd168427cf8ca570789098b984d..ac735f87221a9ea22ecd9ee3798e3dafa24782b7 100644 (file)
--- a/include/configs/am43xx_evm.h
+++ b/include/configs/am43xx_evm.h
@@ -24,7 +24,7 @@
 
 /* Power */
 #if !CONFIG_IS_ENABLED(DM_I2C)
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #endif
 #define CONFIG_POWER_TPS65218

diff --git a/include/configs/cl-som-imx7.h b/include/configs/cl-som-imx7.h
index 7c7ddadbf5c724f64a1c058f49cae9caa51d7b53..0692653a9ff0d160f22b14ea45d5e163cef8f648 100644 (file)
--- a/include/configs/cl-som-imx7.h
+++ b/include/configs/cl-som-imx7.h
@@ -22,7 +22,7 @@
 #define IMX_FEC_BASE                   ENET_IPS_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 80db84162ff227978b9ddebe0272ff3d6e450d05..32d2581764fb37cec348bd9bff7b2b68c7d6fabe 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -50,7 +50,7 @@
 #define CONFIG_AM437X_USB2PHY2_HOST
 
 /* Power */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_TPS65218
 

diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h
index 3f71db3219a3f7ba2f14f81943ae60a0f41fc4bb..f8af7c427bcaeb645395695d3c30ddcb4d0951d7 100644 (file)
--- a/include/configs/el6x_common.h
+++ b/include/configs/el6x_common.h
@@ -23,7 +23,7 @@
 #define CONFIG_SYS_FSL_USDHC_NUM       2
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index dbe36989aa979fac0862d2886a2a22678f8e2caf..615cc0b2e05f8d2b2ea058220695324e24bd8818 100644 (file)
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -65,7 +65,7 @@
 /*
  * PMIC
  */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/hikey.h b/include/configs/hikey.h
index eee342e774815787754f155a0b9641b92fd1f287..f6685a928a6784054566333f22d8dc59c7136eef 100644 (file)
--- a/include/configs/hikey.h
+++ b/include/configs/hikey.h
@@ -13,7 +13,7 @@
 
 #include <linux/sizes.h>
 
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_HI6553
 
 #define CONFIG_REMAKE_ELF

diff --git a/include/configs/imx8mp_evk.h b/include/configs/imx8mp_evk.h
index 9dd4bf7b2415a00839fd224e177086d18de7d68d..16417926c945ca00b3c938fed1a53d9d645efc56 100644 (file)
--- a/include/configs/imx8mp_evk.h
+++ b/include/configs/imx8mp_evk.h
@@ -31,7 +31,7 @@
 
 #undef CONFIG_DM_MMC
 
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PCA9450
 

diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h
index e0666c9addaadb1f51d368c2952b50119a02069d..d694379fddbe6875f3dafec55da13de450f98c1b 100644 (file)
--- a/include/configs/imx8mq_evk.h
+++ b/include/configs/imx8mq_evk.h
@@ -44,7 +44,7 @@
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h
index 2fd1302bcfd9c342efa7fba384456a946d288438..ff8a1682881a1bc5a593246e6fa5f2aa73958ee5 100644 (file)
--- a/include/configs/imx8mq_phanbell.h
+++ b/include/configs/imx8mq_phanbell.h
@@ -41,7 +41,7 @@
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #endif
 

diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h
index 40c045a97f34e7d266b601214761139a676a96f2..b40a6969164426d2c1b05abd67c01ca75c499065 100644 (file)
--- a/include/configs/ls1046ardb.h
+++ b/include/configs/ls1046ardb.h
@@ -124,8 +124,8 @@
 #define I2C_RETIMER_ADDR                       0x18
 
 /* PMIC */
-#define CONFIG_POWER
-#ifdef CONFIG_POWER
+#define CONFIG_POWER_LEGACY
+#ifdef CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #endif
 

diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h
index 0022c334839e31bce925b4311c551827e26c089d..bd2d0e5ee796a22bf74a0ecddb115aada21f248a 100644 (file)
--- a/include/configs/mx51evk.h
+++ b/include/configs/mx51evk.h
@@ -30,7 +30,7 @@
 #define CONFIG_MXC_UART_BASE   UART1_BASE
 
 /* PMIC Controller */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_SPI
 #define CONFIG_POWER_FSL
 #define CONFIG_FSL_PMIC_BUS    0

diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h
index 479ffdf02fc73e1398ef9e6af6fed5d1d160580d..a546e9620c29061f8449aec660ebb2faf36c3c24 100644 (file)
--- a/include/configs/mx53loco.h
+++ b/include/configs/mx53loco.h
@@ -33,7 +33,7 @@
 #define CONFIG_MXC_USB_FLAGS   0
 
 /* PMIC Controller */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_DIALOG_POWER
 #define CONFIG_POWER_FSL

diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h
index f854ddd87b26ea502a1d397d827bac2c8c897f9d..ccf631dedd463fc6dff90ed7f4a700ed94fb3add 100644 (file)
--- a/include/configs/mx6sabreauto.h
+++ b/include/configs/mx6sabreauto.h
@@ -59,7 +59,7 @@
 /* DMA stuff, needed for GPMI/MXS NAND support */
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h
index 73f48c6dae52f77c9d2d539a92b04c7219e8f5d1..ee75ada5a71864509e0f343fb012cdeac9bb8419 100644 (file)
--- a/include/configs/mx6sabresd.h
+++ b/include/configs/mx6sabresd.h
@@ -38,7 +38,7 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/novena.h b/include/configs/novena.h
index 1a175f13150948c928eb4a6fb0d2b192f9980c73..e39191fa1a9ee87aa4a616a9b9d4ff6b5defe1b4 100644 (file)
--- a/include/configs/novena.h
+++ b/include/configs/novena.h
@@ -68,7 +68,7 @@
 #endif
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/phycore_imx8mp.h b/include/configs/phycore_imx8mp.h
index 3f3b175df72f8be014e523c581abf67550fc1d02..f9686e14a8f93b6f55b5045e94abe514108ef506 100644 (file)
--- a/include/configs/phycore_imx8mp.h
+++ b/include/configs/phycore_imx8mp.h
@@ -29,7 +29,7 @@
 
 #define CONFIG_SPL_ABORT_ON_RAW_IMAGE
 
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PCA9450
 

diff --git a/include/configs/pico-imx7d.h b/include/configs/pico-imx7d.h
index a1cf8fc7d898be1e46465974bfa401755b64e748..a0e782dbd3440e045313dcb3ebe77e4bd9b21521 100644 (file)
--- a/include/configs/pico-imx7d.h
+++ b/include/configs/pico-imx7d.h
@@ -122,7 +122,7 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08

diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h
index 09e0f44872b51aa844d380cbcc19ab0a6e420ddd..c67264da1748813dc2d4b84e36023b1f519ac3b6 100644 (file)
--- a/include/configs/pico-imx8mq.h
+++ b/include/configs/pico-imx8mq.h
@@ -41,7 +41,7 @@
 
 #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
 
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #endif
 

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 97113b03432165b39a9c2a0b180ff3a02358e0bf..11ad2f7cc2f4e82b17b2044f3524ed5afb4e09c2 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -42,7 +42,7 @@
 #define CONFIG_SYS_I2C_EEPROM_PAGE_WRITE_DELAY_MS      20
 
 #if !defined(CONFIG_DM_PMIC)
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h
index cf47e3fbe94c66eaa4b9a7b557b3e510190cf629..d51a25dd2e41e7f9f88874cd0a977035cde25d4d 100644 (file)
--- a/include/configs/udoo_neo.h
+++ b/include/configs/udoo_neo.h
@@ -68,7 +68,7 @@
        (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET)
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE3000
 #define CONFIG_POWER_PFUZE3000_I2C_ADDR        0x08

diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h
index ade0537f871e0430da4bc37ce7f4765c08e8ca50..4c34bec29249cca84618993eb55fac664e011006 100644 (file)
--- a/include/configs/vining_2000.h
+++ b/include/configs/vining_2000.h
@@ -40,7 +40,7 @@
 #define CONFIG_SYS_FSL_ESDHC_ADDR      USDHC4_BASE_ADDR
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 #define CONFIG_POWER_PFUZE100
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/configs/warp.h b/include/configs/warp.h
index d3921dabf6a2e6cf675ee9486d7fcf92f30df5a8..29f69bb7dcd4b3d5eefd807735b1faf749643df5 100644 (file)
--- a/include/configs/warp.h
+++ b/include/configs/warp.h
@@ -52,7 +52,7 @@
 /* I2C Configs */
 
 /* PMIC */
-#define CONFIG_POWER
+#define CONFIG_POWER_LEGACY
 #define CONFIG_POWER_I2C
 
 #define CONFIG_EXTRA_ENV_SETTINGS \

diff --git a/include/power/max77686_pmic.h b/include/power/max77686_pmic.h
index 82fe3509a0b7a94d0e371c78d0f223aec6e88108..95ba61d9530f2205d303aae53c36b3775471da2f 100644 (file)
--- a/include/power/max77686_pmic.h
+++ b/include/power/max77686_pmic.h
@@ -154,7 +154,7 @@ enum {
        OPMODE_ON,
 };
 
-#ifdef CONFIG_POWER
+#ifdef CONFIG_POWER_LEGACY
 int max77686_set_ldo_voltage(struct pmic *p, int ldo, ulong uV);
 int max77686_set_ldo_mode(struct pmic *p, int ldo, char opmode);
 int max77686_set_buck_voltage(struct pmic *p, int buck, ulong uV);

diff --git a/include/power/pmic.h b/include/power/pmic.h
index be9de6b4de7e610516171386c3272440dfc9f52a..a10e1735007f681cd36b8fc1a13031ed4127f24d 100644 (file)
--- a/include/power/pmic.h
+++ b/include/power/pmic.h
@@ -17,7 +17,8 @@
 
 enum { PMIC_I2C, PMIC_SPI, PMIC_NONE};
 
-#ifdef CONFIG_POWER
+/* TODO: Change to !CONFIG_IS_ENABLED(DM_PMIC) when SPL_DM_PMIC exists */
+#ifdef CONFIG_POWER_LEGACY
 enum { I2C_PMIC, I2C_NUM, };
 enum { PMIC_READ, PMIC_WRITE, };
 enum { PMIC_SENSOR_BYTE_ORDER_LITTLE, PMIC_SENSOR_BYTE_ORDER_BIG, };
@@ -82,8 +83,9 @@ struct pmic {
        struct pmic *parent;
        struct list_head list;
 };
-#endif /* CONFIG_POWER */
+#endif /* CONFIG_POWER_LEGACY */
 
+/* TODO: Change to CONFIG_IS_ENABLED(DM_PMIC) when SPL_DM_PMIC exists */
 #ifdef CONFIG_DM_PMIC
 /**
  * U-Boot PMIC Framework
@@ -306,9 +308,12 @@ struct uc_pmic_priv {
        uint trans_len;
 };
 
-#endif /* CONFIG_DM_PMIC */
+#endif /* DM_PMIC */
 
-#ifdef CONFIG_POWER
+/* TODO: Change to CONFIG_IS_ENABLED(DM_PMIC) when SPL_DM_PMIC exists */
+#ifdef CONFIG_POWER_LEGACY
+
+/* Legacy API, do not use */
 int pmic_init(unsigned char bus);
 int power_init_board(void);
 int pmic_dialog_init(unsigned char bus);
@@ -319,7 +324,7 @@ int pmic_probe(struct pmic *p);
 int pmic_reg_read(struct pmic *p, u32 reg, u32 *val);
 int pmic_reg_write(struct pmic *p, u32 reg, u32 val);
 int pmic_set_output(struct pmic *p, u32 reg, int ldo, int on);
-#endif
+#endif /* CONFIG_POWER_LEGACY */
 
 #define pmic_i2c_addr (p->hw.i2c.addr)
 #define pmic_i2c_tx_num (p->hw.i2c.tx_num)

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 0dbcc165a6da53458442856ff6675a02018b871e..50e607f436f38b6f0f4abb87b775ca35e0a86d02 100644 (file)
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -1032,11 +1032,11 @@ CONFIG_POST_EXTERNAL_WORD_FUNCS
 CONFIG_POST_SKIP_ENV_FLAGS
 CONFIG_POST_UART
 CONFIG_POST_WATCHDOG
-CONFIG_POWER
 CONFIG_POWER_FSL
 CONFIG_POWER_FSL_MC13892
 CONFIG_POWER_HI6553
 CONFIG_POWER_I2C
+CONFIG_POWER_LEGACY
 CONFIG_POWER_LTC3676
 CONFIG_POWER_LTC3676_I2C_ADDR
 CONFIG_POWER_MAX77696_I2C_ADDR