i2c: Remove CFG_I2C_MULTI_BUS

This is used by a few boards but we are years past the migration date,
so let's drop it now.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heiko Schocher <hs@denx.de>

diff --git a/README b/README
index b76449b70a8feba6832ec7af392080768ee4d43f..c3821c5ce4ee01821ffd78fe7a51d48f5afddbcb 100644 (file)
--- a/README
+++ b/README
@@ -883,13 +883,6 @@ The following options need to be configured:
                You should define these to the GPIO value as given directly to
                the generic GPIO functions.
 
-               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
-               active.  To switch to a different bus, use the 'i2c dev' command.
-               Note that bus numbering is zero-based.
-
                CFG_SYS_I2C_NOPROBES
 
                This option specifies a list of I2C devices that will be skipped

diff --git a/include/configs/sniper.h b/include/configs/sniper.h
index 45a3102aeeef65f4c92bed40d8c243db9444a2a8..d0ae5e18605b826a504f29ed8b0adf3945e5525e 100644 (file)
--- a/include/configs/sniper.h
+++ b/include/configs/sniper.h
@@ -34,20 +34,6 @@
 
 #define CFG_SYS_SDRAM_BASE             0x80000000
 
-/*
- * I2C
- */
-
-#define CFG_I2C_MULTI_BUS
-
-/*
- * Input
- */
-
-/*
- * SPL
- */
-
 /*
  * Serial
  */

diff --git a/include/configs/tqma6.h b/include/configs/tqma6.h
index 2da76f154313860d21bd1a5a3f583be30b96f78e..ceeed174ec543d4e4613d81c74b61bc258d3bceb 100644 (file)
--- a/include/configs/tqma6.h
+++ b/include/configs/tqma6.h
@@ -26,9 +26,6 @@
 
 #define TQMA6_SPI_FLASH_SECTOR_SIZE    SZ_64K
 
-/* I2C Configs */
-#define CFG_I2C_MULTI_BUS
-
 #if !defined(CONFIG_DM_PMIC)
 #define CFG_POWER_PFUZE100_I2C_ADDR    0x08
 #define TQMA6_PFUZE100_I2C_BUS         2

diff --git a/include/i2c.h b/include/i2c.h
index 1d3be3f67591a3bec1ab78dc4953529858ff1f65..622540c82658977540cd160ed242159251b944d2 100644 (file)
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -942,7 +942,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(CFG_I2C_MULTI_BUS)
+#if CONFIG_IS_ENABLED(SYS_I2C_LEGACY)
 # if !defined(CFG_SYS_MAX_I2C_BUS)
 #  define CFG_SYS_MAX_I2C_BUS          2
 # endif