[PoC 153/241] global: Migrate CONFIG_POWER_LTC3676_I2C_ADDR to CFG

Tom Rini
2022-11-20T14:31:31Z

board/gateworks/gw_ventana/gw_ventana_spl.c | 4 ++--
drivers/power/pmic/pmic_ltc3676.c | 2 +-
include/configs/gw_ventana.h | 2 +-
scripts/config_whitelist.txt | 6 ++----
4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c
index e85a00954cee..6ad994af1c64 100644
--- a/board/gateworks/gw_ventana/gw_ventana_spl.c
+++ b/board/gateworks/gw_ventana/gw_ventana_spl.c
@@ -851,8 +851,8 @@ void setup_pmic(void)
}

/* configure LTC3676 PMIC */
- else if (!i2c_probe(CONFIG_POWER_LTC3676_I2C_ADDR)) {
- debug("probed LTC3676@0x%x\n", CONFIG_POWER_LTC3676_I2C_ADDR);
+ else if (!i2c_probe(CFG_POWER_LTC3676_I2C_ADDR)) {
+ debug("probed LTC3676@0x%x\n", CFG_POWER_LTC3676_I2C_ADDR);
power_ltc3676_init(i2c_pmic);
p = pmic_get("LTC3676_PMIC");
if (!p || pmic_probe(p))
diff --git a/drivers/power/pmic/pmic_ltc3676.c b/drivers/power/pmic/pmic_ltc3676.c
index 00c3e201cd56..af94f37b0f10 100644
--- a/drivers/power/pmic/pmic_ltc3676.c
+++ b/drivers/power/pmic/pmic_ltc3676.c
@@ -23,7 +23,7 @@ int power_ltc3676_init(unsigned char bus)
p->name = name;
p->interface = PMIC_I2C;
p->number_of_regs = LTC3676_NUM_OF_REGS;
- p->hw.i2c.addr = CONFIG_POWER_LTC3676_I2C_ADDR;
+ p->hw.i2c.addr = CFG_POWER_LTC3676_I2C_ADDR;
p->hw.i2c.tx_num = 1;
p->bus = bus;

diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h
index 4741d399590c..577322a5987d 100644
--- a/include/configs/gw_ventana.h
+++ b/include/configs/gw_ventana.h
@@ -31,7 +31,7 @@
* PMIC
*/
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
-#define CONFIG_POWER_LTC3676_I2C_ADDR 0x3c
+#define CFG_POWER_LTC3676_I2C_ADDR 0x3c

/* Various command support */

diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt
index 2b3e4a79a00c..52a78f10cd52 100644
--- a/scripts/config_whitelist.txt
+++ b/scripts/config_whitelist.txt
@@ -161,10 +161,8 @@ CFG_PHY_IRAM_BASE
CFG_PL011_CLOCK
CFG_PL01x_PORTS
CFG_PME_PLAT_CLK_DIV
-CONFIG_POST
-CONFIG_POSTBOOTMENU
-CONFIG_POST_EXTERNAL_WORD_FUNCS
-CONFIG_POWER_LTC3676_I2C_ADDR
+CFG_POSTBOOTMENU
+CFG_POWER_LTC3676_I2C_ADDR
CONFIG_POWER_PFUZE100_I2C_ADDR
CONFIG_POWER_PFUZE3000_I2C_ADDR
CONFIG_PPC_SPINTABLE_COMPATIBLE
--
2.25.1