i2c: Remove unused additional legacy soft i2c bus support

Currently the legacy software i2c support is only used for a single bus.
Remove all of the extra and unused support.  Also update the README to
not reference that, and finish removing some already badly auto-edited
related text.

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

diff --git a/README b/README
index 1c1db9809878cb0baab878755c08a6a72c440cac..a16afea4c94cae50d8ab0949104a712650dfa231 100644 (file)
--- a/README
+++ b/README
@@ -1466,20 +1466,6 @@ The following options need to be configured:
                Note: This is deprecated in favour of driver model. Use
                CONFIG_DM_I2C instead.
 
-               This enable the legacy i2c subsystem, and will allow you to use
-               i2c commands at the u-boot command line (as long as you set
-                   CONFIG_SYS_I2C_SOFT_SPEED and CONFIG_SYS_I2C_SOFT_SLAVE
-                   for defining speed and slave address
-                 - activate second bus with I2C_SOFT_DECLARATIONS2 define
-                   CONFIG_SYS_I2C_SOFT_SPEED_2 and CONFIG_SYS_I2C_SOFT_SLAVE_2
-                   for defining speed and slave address
-                 - activate third bus with I2C_SOFT_DECLARATIONS3 define
-                   CONFIG_SYS_I2C_SOFT_SPEED_3 and CONFIG_SYS_I2C_SOFT_SLAVE_3
-                   for defining speed and slave address
-                 - activate fourth bus with I2C_SOFT_DECLARATIONS4 define
-                   CONFIG_SYS_I2C_SOFT_SPEED_4 and CONFIG_SYS_I2C_SOFT_SLAVE_4
-                   for defining speed and slave address
-
                - drivers/i2c/fsl_i2c.c:
                  - activate i2c driver with CONFIG_SYS_I2C_FSL
                    define CONFIG_SYS_FSL_I2C_OFFSET for setting the register

diff --git a/drivers/i2c/soft_i2c.c b/drivers/i2c/soft_i2c.c
index db69c18cb6deb16844813dc6ebf0de6c1733b2a4..c72839eb0111678fe02c99be7ceadcb270410e88 100644 (file)
--- a/drivers/i2c/soft_i2c.c
+++ b/drivers/i2c/soft_i2c.c
@@ -438,80 +438,3 @@ U_BOOT_I2C_ADAP_COMPLETE(soft00, soft_i2c_init, soft_i2c_probe,
                         soft_i2c_read, soft_i2c_write, NULL,
                         CONFIG_SYS_I2C_SOFT_SPEED, CONFIG_SYS_I2C_SOFT_SLAVE,
                         0)
-#if defined(I2C_SOFT_DECLARATIONS2)
-U_BOOT_I2C_ADAP_COMPLETE(soft01, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_2,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_2,
-                        1)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS3)
-U_BOOT_I2C_ADAP_COMPLETE(soft02, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_3,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_3,
-                        2)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS4)
-U_BOOT_I2C_ADAP_COMPLETE(soft03, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_4,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_4,
-                        3)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS5)
-U_BOOT_I2C_ADAP_COMPLETE(soft04, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_5,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_5,
-                        4)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS6)
-U_BOOT_I2C_ADAP_COMPLETE(soft05, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_6,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_6,
-                        5)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS7)
-U_BOOT_I2C_ADAP_COMPLETE(soft06, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_7,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_7,
-                        6)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS8)
-U_BOOT_I2C_ADAP_COMPLETE(soft07, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_8,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_8,
-                        7)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS9)
-U_BOOT_I2C_ADAP_COMPLETE(soft08, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_9,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_9,
-                        8)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS10)
-U_BOOT_I2C_ADAP_COMPLETE(soft09, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_10,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_10,
-                        9)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS11)
-U_BOOT_I2C_ADAP_COMPLETE(soft10, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_11,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_11,
-                        10)
-#endif
-#if defined(I2C_SOFT_DECLARATIONS12)
-U_BOOT_I2C_ADAP_COMPLETE(soft11, soft_i2c_init, soft_i2c_probe,
-                        soft_i2c_read, soft_i2c_write, NULL,
-                        CONFIG_SYS_I2C_SOFT_SPEED_12,
-                        CONFIG_SYS_I2C_SOFT_SLAVE_12,
-                        11)
-#endif