From: Simon Glass <sjg@chromium.org>
Date: Sun, 11 Aug 2024 14:50:32 +0000 (-0600)
Subject: i2c: Remove CFG_I2C_MULTI_BUS
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=a1e8cd22c804351c12bebc87bd0112871dfcf2fd;p=u-boot.git

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 b76449b70a..c3821c5ce4 100644
--- 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 45a3102aee..d0ae5e1860 100644
--- 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 2da76f1543..ceeed174ec 100644
--- 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 1d3be3f675..622540c826 100644
--- 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