global: Migrate CONFIG_I2C_MVTWSI_BASE0 to CFG

Perform a simple rename of CONFIG_I2C_MVTWSI_BASE0 to CFG_I2C_MVTWSI_BASE0

Signed-off-by: Tom Rini <trini@konsulko.com>

diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h
index 241b449..2c2d6b7 100644 (file)
--- a/arch/arm/include/asm/arch-sunxi/i2c.h
+++ b/arch/arm/include/asm/arch-sunxi/i2c.h
@@ -8,7 +8,7 @@
 #include <asm/arch/cpu.h>
 
 #ifdef CONFIG_I2C0_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE0        SUNXI_TWI0_BASE
+#define CFG_I2C_MVTWSI_BASE0   SUNXI_TWI0_BASE
 #endif
 #ifdef CONFIG_I2C1_ENABLE
 #define CONFIG_I2C_MVTWSI_BASE1        SUNXI_TWI1_BASE

diff --git a/arch/arm/mach-kirkwood/include/mach/config.h b/arch/arm/mach-kirkwood/include/mach/config.h
index a6de767..fbef9c9 100644 (file)
--- a/arch/arm/mach-kirkwood/include/mach/config.h
+++ b/arch/arm/mach-kirkwood/include/mach/config.h
@@ -24,7 +24,7 @@
 
 #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_SATA_BASE           KW_SATA_BASE
 #define MV_SATA_PORT0_OFFSET   KW_SATA_PORT0_OFFSET

diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index a9c7d6e..076525d 100644 (file)
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -197,9 +197,9 @@ inline uint calc_tick(uint speed)
 static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
 {
        switch (adap->hwadapnr) {
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
        case 0:
-               return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE0;
+               return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
 #endif
 #ifdef CONFIG_I2C_MVTWSI_BASE1
        case 1:
@@ -737,7 +737,7 @@ static int twsi_i2c_write(struct i2c_adapter *adap, uchar chip, uint addr,
                                10000);
 }
 
-#ifdef CONFIG_I2C_MVTWSI_BASE0
+#ifdef CFG_I2C_MVTWSI_BASE0
 U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
                         twsi_i2c_read, twsi_i2c_write,
                         twsi_i2c_set_bus_speed,

diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h
index ef9c457..54de2d0 100644 (file)
--- a/include/configs/db-88f6720.h
+++ b/include/configs/db-88f6720.h
@@ -17,7 +17,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0                MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0           MVEBU_TWSI_BASE
 
 /* USB/EHCI configuration */
 

diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h
index 6dbf582..2cbe4eb 100644 (file)
--- a/include/configs/db-88f6820-gp.h
+++ b/include/configs/db-88f6820-gp.h
@@ -11,7 +11,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0                MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0           MVEBU_TWSI_BASE
 
 /* Environment in SPI NOR flash */
 

diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h
index bf8b351..5c6d7fa 100644 (file)
--- a/include/configs/db-mv784mp-gp.h
+++ b/include/configs/db-mv784mp-gp.h
@@ -13,7 +13,7 @@
  */
 
 /* I2C */
-#define CONFIG_I2C_MVTWSI_BASE0                MVEBU_TWSI_BASE
+#define CFG_I2C_MVTWSI_BASE0           MVEBU_TWSI_BASE
 
 /* USB/EHCI configuration */
 

diff --git a/include/configs/ds414.h b/include/configs/ds414.h
index e69883b..9446acb 100644 (file)
--- a/include/configs/ds414.h
+++ b/include/configs/ds414.h
@@ -17,7 +17,7 @@
  */
 
 /* 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

diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h
index 5ad945b..413597e 100644 (file)
--- a/include/configs/maxbcm.h
+++ b/include/configs/maxbcm.h
@@ -19,7 +19,7 @@
  */
 
 /* 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 */
 

diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 9722b0d..412698d 100644 (file)
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -25,7 +25,7 @@
  */
 
 /* 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
 
 /* USB/EHCI configuration */