global: Migrate CONFIG_I2C_MULTI_BUS to CFG

Perform a simple rename of CONFIG_I2C_MULTI_BUS to CFG_I2C_MULTI_BUS

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

diff --git a/README b/README
index 84086764d8100544ebd9fd033ffca9268067c6ca..05618352fa9331c57faf2c868a158ff9ab490486 100644 (file)
--- a/README
+++ b/README
@@ -955,7 +955,7 @@ The following options need to be configured:
                You should define these to the GPIO value as given directly to
                the generic GPIO functions.
 
-               CONFIG_I2C_MULTI_BUS
+               CFG_I2C_MULTI_BUS
 
                This option allows the use of multiple I2C buses, each of which
                must have a controller.  At any point in time, only one bus is

diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index efeb7bf1007815e7f24b46d99a3cee343d332253..af7cb3513f8f820439950cc51a3d68c18dadd1de 100644 (file)
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -29,7 +29,7 @@
 #endif /* CONFIG_MTD_RAW_NAND */
 
 /* Enable Multi Bus support for I2C */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /* DSS Support */
 

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index eaee8dd3739683c2a72a8ef2244abb74fd4b21c4..45a3102aeeef65f4c92bed40d8c243db9444a2a8 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -38,7 +38,7 @@
  * I2C
  */
 
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 /*
  * Input

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 14d7730f67bf368183e2ba6ded201fd7b4665399..cb5f7fc25af98962a857488ee2ef4a268b75a0de 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -28,7 +28,7 @@
 #define TQMA6_SPI_FLASH_SECTOR_SIZE    SZ_64K
 
 /* I2C Configs */
-#define CONFIG_I2C_MULTI_BUS
+#define CFG_I2C_MULTI_BUS
 
 #if !defined(CONFIG_DM_PMIC)
 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08

diff --git a/include/i2c.h b/include/i2c.h
index 51390f8fd84f329cab5ee7b582be4b94260ab982..3811b26c08e08bfef3756aca466e91c8a571eda7 100644 (file)
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -930,7 +930,7 @@ unsigned int i2c_get_bus_speed(void);
  * only for backwardcompatibility, should go away if we switched
  * completely to new multibus support.
  */
-#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CONFIG_I2C_MULTI_BUS)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY) || defined(CFG_I2C_MULTI_BUS)
 # if !defined(CFG_SYS_MAX_I2C_BUS)
 #  define CFG_SYS_MAX_I2C_BUS          2
 # endif