leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

global: Migrate CONFIG_I2C_MVTWSI_BASE0 to CFG

Browse Source 
Perform a simple rename of CONFIG_I2C_MVTWSI_BASE0 to CFG_I2C_MVTWSI_BASE0

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-04 10:04:09 -05:00
parent e06b9b8d75
commit 45ede979e8
9 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/arch-sunxi/i2c.h
View File

@ -8,7 +8,7 @@
#include <asm/arch/cpu.h> #include <asm/arch/cpu.h>
#ifdef CONFIG_I2C0_ENABLE #ifdef CONFIG_I2C0_ENABLE
#define CONFIG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE #define CFG_I2C_MVTWSI_BASE0 SUNXI_TWI0_BASE
#endif #endif
#ifdef CONFIG_I2C1_ENABLE #ifdef CONFIG_I2C1_ENABLE
#define CONFIG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE #define CONFIG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE

2
arch/arm/mach-kirkwood/include/mach/config.h
View File

@ -24,7 +24,7 @@
#include <asm/arch/soc.h> #include <asm/arch/soc.h>
#define CONFIG_I2C_MVTWSI_BASE0 KW_TWSI_BASE #define CFG_I2C_MVTWSI_BASE0 KW_TWSI_BASE
#define MV_UART_CONSOLE_BASE KW_UART0_BASE #define MV_UART_CONSOLE_BASE KW_UART0_BASE
#define MV_SATA_BASE KW_SATA_BASE #define MV_SATA_BASE KW_SATA_BASE
#define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET #define MV_SATA_PORT0_OFFSET KW_SATA_PORT0_OFFSET

6
drivers/i2c/mvtwsi.c
View File

@ -197,9 +197,9 @@ inline uint calc_tick(uint speed)
static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap) static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
{ {
switch (adap->hwadapnr) { switch (adap->hwadapnr) {
#ifdef CONFIG_I2C_MVTWSI_BASE0 #ifdef CFG_I2C_MVTWSI_BASE0
case 0: case 0:
return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0; return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
#endif #endif
#ifdef CONFIG_I2C_MVTWSI_BASE1 #ifdef CONFIG_I2C_MVTWSI_BASE1
case 1: case 1:
@ -737,7 +737,7 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
10000); 10000);
} }
#ifdef CONFIG_I2C_MVTWSI_BASE0 #ifdef CFG_I2C_MVTWSI_BASE0
U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe, U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
twsi_i2c_read, twsi_i2c_write, twsi_i2c_read, twsi_i2c_write,
twsi_i2c_set_bus_speed, twsi_i2c_set_bus_speed,

2
include/configs/db-88f6720.h
View File

@ -17,7 +17,7 @@
*/ */
/* I2C */ /* I2C */
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* USB/EHCI configuration */ /* USB/EHCI configuration */

2
include/configs/db-88f6820-gp.h
View File

@ -11,7 +11,7 @@
*/ */
/* I2C */ /* I2C */
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* Environment in SPI NOR flash */ /* Environment in SPI NOR flash */

2
include/configs/db-mv784mp-gp.h
View File

@ -13,7 +13,7 @@
*/ */
/* I2C */ /* I2C */
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* USB/EHCI configuration */ /* USB/EHCI configuration */

2
include/configs/ds414.h
View File

@ -17,7 +17,7 @@
*/ */
/* I2C */ /* I2C */
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* /*
* mv-common.h should be defined after CMD configs since it used them * mv-common.h should be defined after CMD configs since it used them

2
include/configs/maxbcm.h
View File

@ -19,7 +19,7 @@
*/ */
/* I2C */ /* I2C */
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
/* SPI NOR flash default params, used by sf commands */ /* SPI NOR flash default params, used by sf commands */

2
include/configs/theadorable.h
View File

@ -25,7 +25,7 @@
*/ */
/* I2C */ /* I2C */
#define CONFIG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE #define CFG_I2C_MVTWSI_BASE0 MVEBU_TWSI_BASE
#define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE #define CONFIG_I2C_MVTWSI_BASE1 MVEBU_TWSI1_BASE
/* USB/EHCI configuration */ /* USB/EHCI configuration */