Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-21 20:34:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

global: Migrate CONFIG_I2C_MVTWSI_BASE1 to CFG

Browse source 
Perform a simple rename of CONFIG_I2C_MVTWSI_BASE1 to CFG_I2C_MVTWSI_BASE1

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-12-04 10:04:10 -05:00
parent 45ede979e8
commit 35661f86eb
3 changed files with 5 additions and 5 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

@ -11,7 +11,7 @@
#define CFG_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 CFG_I2C_MVTWSI_BASE1 SUNXI_TWI1_BASE
#endif #endif
#ifdef CONFIG_R_I2C_ENABLE #ifdef CONFIG_R_I2C_ENABLE
#define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE #define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE

6
drivers/i2c/mvtwsi.c
View file

@ -201,9 +201,9 @@ static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
case 0: case 0:
return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0; return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
#endif #endif
#ifdef CONFIG_I2C_MVTWSI_BASE1 #ifdef CFG_I2C_MVTWSI_BASE1
case 1: case 1:
return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1; return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1;
#endif #endif
#ifdef CONFIG_I2C_MVTWSI_BASE2 #ifdef CONFIG_I2C_MVTWSI_BASE2
case 2: case 2:
@ -743,7 +743,7 @@ U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
twsi_i2c_set_bus_speed, twsi_i2c_set_bus_speed,
CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0) CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0)
#endif #endif
#ifdef CONFIG_I2C_MVTWSI_BASE1 #ifdef CFG_I2C_MVTWSI_BASE1
U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe, U_BOOT_I2C_ADAP_COMPLETE(twsi1, 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/theadorable.h
View file

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