From: Tom Rini Date: Sun, 4 Dec 2022 15:13:35 +0000 (-0500) Subject: global: Migrate CONFIG_POWER_PFUZE100_I2C_ADDR to CFG X-Git-Tag: v2023.07~207^2~5^2~45 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa3efb6c64513ad3d5eb876488a90b2ee2b8ccc0;p=platform%2Fkernel%2Fu-boot.git global: Migrate CONFIG_POWER_PFUZE100_I2C_ADDR to CFG Perform a simple rename of CONFIG_POWER_PFUZE100_I2C_ADDR to CFG_POWER_PFUZE100_I2C_ADDR Signed-off-by: Tom Rini --- diff --git a/board/gateworks/gw_ventana/gw_ventana_spl.c b/board/gateworks/gw_ventana/gw_ventana_spl.c index 6ad994a..2f046c9 100644 --- a/board/gateworks/gw_ventana/gw_ventana_spl.c +++ b/board/gateworks/gw_ventana/gw_ventana_spl.c @@ -791,8 +791,8 @@ void setup_pmic(void) i2c_set_bus_num(i2c_pmic); /* configure PFUZE100 PMIC */ - if (!i2c_probe(CONFIG_POWER_PFUZE100_I2C_ADDR)) { - debug("probed PFUZE100@0x%x\n", CONFIG_POWER_PFUZE100_I2C_ADDR); + if (!i2c_probe(CFG_POWER_PFUZE100_I2C_ADDR)) { + debug("probed PFUZE100@0x%x\n", CFG_POWER_PFUZE100_I2C_ADDR); power_pfuze100_init(i2c_pmic); p = pmic_get("PFUZE100"); if (p && !pmic_probe(p)) { diff --git a/drivers/power/pmic/pmic_pfuze100.c b/drivers/power/pmic/pmic_pfuze100.c index c646a0c..5115b55 100644 --- a/drivers/power/pmic/pmic_pfuze100.c +++ b/drivers/power/pmic/pmic_pfuze100.c @@ -23,7 +23,7 @@ int power_pfuze100_init(unsigned char bus) p->name = name; p->interface = PMIC_I2C; p->number_of_regs = PFUZE100_NUM_OF_REGS; - p->hw.i2c.addr = CONFIG_POWER_PFUZE100_I2C_ADDR; + p->hw.i2c.addr = CFG_POWER_PFUZE100_I2C_ADDR; p->hw.i2c.tx_num = 1; p->bus = bus; diff --git a/include/configs/el6x_common.h b/include/configs/el6x_common.h index 6913a91..78af42d 100644 --- a/include/configs/el6x_common.h +++ b/include/configs/el6x_common.h @@ -17,7 +17,7 @@ #define CFG_SYS_FSL_USDHC_NUM 2 /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 /* Commands */ diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 85a2ad2..ebc5d03 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -30,7 +30,7 @@ /* * PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 #define CFG_POWER_LTC3676_I2C_ADDR 0x3c /* Various command support */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index a7a5190..d2de290 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -18,7 +18,7 @@ #define CFG_MALLOC_F_ADDR 0x182000 /* For RAW image gives a error info not panic */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 #endif /* ENET Config */ diff --git a/include/configs/kontron_pitx_imx8m.h b/include/configs/kontron_pitx_imx8m.h index bf590ef..e3a021c 100644 --- a/include/configs/kontron_pitx_imx8m.h +++ b/include/configs/kontron_pitx_imx8m.h @@ -20,7 +20,7 @@ /* For RAW image gives a error info not panic */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 #endif /* ENET1 Config */ diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index da98139..05ae2fc 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -36,6 +36,6 @@ /* DMA stuff, needed for GPMI/MXS NAND support */ /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 #endif /* __MX6SABREAUTO_CONFIG_H */ diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index 1aa8a56..30d3b9d 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -25,7 +25,7 @@ #endif /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 /* USB Configs */ #ifdef CONFIG_CMD_USB diff --git a/include/configs/novena.h b/include/configs/novena.h index 5e8b7fa..39d3afd 100644 --- a/include/configs/novena.h +++ b/include/configs/novena.h @@ -46,7 +46,7 @@ #endif /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 /* UART */ #define CFG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h index af5a474..8c75a75 100644 --- a/include/configs/tqma6.h +++ b/include/configs/tqma6.h @@ -31,7 +31,7 @@ #define CFG_I2C_MULTI_BUS #if !defined(CONFIG_DM_PMIC) -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 #define TQMA6_PFUZE100_I2C_BUS 2 #endif diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 7bfc22c..3065419 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -31,7 +31,7 @@ #define CFG_SYS_FSL_ESDHC_ADDR USDHC4_BASE_ADDR /* PMIC */ -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 +#define CFG_POWER_PFUZE100_I2C_ADDR 0x08 /* Network */ #define CFG_FEC_MXC_PHYADDR 0x0