i2c: Remove CFG_SYS_I2C_MAX_HOPS

Now that this is always 0, remove it and the associated dead code.

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

diff --git a/README b/README
index 37c959cc9c22c2ac7eb984d2f480e2a90c64e2dd..4ffa4b8b68c1f492feb539b2097fe0c468a1176b 100644 (file)
--- a/README
+++ b/README
@@ -773,19 +773,11 @@ The following options need to be configured:
 
                CFG_SYS_I2C_DIRECT_BUS
                define this, if you don't use i2c muxes on your hardware.
-               if CFG_SYS_I2C_MAX_HOPS is not defined or == 0 you can
-               omit this define.
-
-               CFG_SYS_I2C_MAX_HOPS
-               define how many muxes are maximal consecutively connected
-               on one i2c bus. If you not use i2c muxes, omit this
-               define.
 
                CFG_SYS_I2C_BUSES
                hold a list of buses you want to use, only used if
                CFG_SYS_I2C_DIRECT_BUS is not defined, for example
-               a board with CFG_SYS_I2C_MAX_HOPS = 1 and
-               CFG_SYS_NUM_I2C_BUSES = 9:
+               a board with CFG_SYS_NUM_I2C_BUSES = 9:
 
                 CFG_SYS_I2C_BUSES      {{0, {I2C_NULL_HOP}}, \
                                        {0, {{I2C_MUX_PCA9547, 0x70, 1}}}, \

diff --git a/cmd/i2c.c b/cmd/i2c.c
index 7dac0a9fb6cbe459096eb4d8de99bc45001f7847..7246c4fa3e7c34b56762f8f95f687696404a9f12 100644 (file)
--- a/cmd/i2c.c
+++ b/cmd/i2c.c
@@ -1698,18 +1698,6 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
 
                for (i = 0; i < CFG_SYS_NUM_I2C_BUSES; i++) {
                        printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
-#ifndef CFG_SYS_I2C_DIRECT_BUS
-                       int j;
-
-                       for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) {
-                               if (i2c_bus[i].next_hop[j].chip == 0)
-                                       break;
-                               printf("->%s@0x%2x:%d",
-                                      i2c_bus[i].next_hop[j].mux.name,
-                                      i2c_bus[i].next_hop[j].chip,
-                                      i2c_bus[i].next_hop[j].channel);
-                       }
-#endif
                        printf("\n");
                }
 #endif
@@ -1734,17 +1722,6 @@ static int do_i2c_show_bus(struct cmd_tbl *cmdtp, int flag, int argc,
                        return -1;
                }
                printf("Bus %d:\t%s", i, I2C_ADAP_NR(i)->name);
-#ifndef CFG_SYS_I2C_DIRECT_BUS
-                       int j;
-                       for (j = 0; j < CFG_SYS_I2C_MAX_HOPS; j++) {
-                               if (i2c_bus[i].next_hop[j].chip == 0)
-                                       break;
-                               printf("->%s@0x%2x:%d",
-                                      i2c_bus[i].next_hop[j].mux.name,
-                                      i2c_bus[i].next_hop[j].chip,
-                                      i2c_bus[i].next_hop[j].channel);
-                       }
-#endif
                printf("\n");
 #endif
        }

diff --git a/drivers/i2c/i2c_core.c b/drivers/i2c/i2c_core.c
index 7c43a5546d3d2bc5ea2e4b021c9508a45fe7ccd2..f371d952af5b713d57347c072c9344a151a7a2ae 100644 (file)
--- a/drivers/i2c/i2c_core.c
+++ b/drivers/i2c/i2c_core.c
@@ -111,23 +111,6 @@ static int i2c_mux_set_all(void)
        struct i2c_bus_hose *i2c_bus_tmp = &i2c_bus[I2C_BUS];
        int i;
 
-       /* Connect requested bus if behind muxes */
-       if (i2c_bus_tmp->next_hop[0].chip != 0) {
-               /* Set all muxes along the path to that bus */
-               for (i = 0; i < CFG_SYS_I2C_MAX_HOPS; i++) {
-                       int     ret;
-
-                       if (i2c_bus_tmp->next_hop[i].chip == 0)
-                               break;
-
-                       ret = i2c_mux_set(I2C_ADAP,
-                                       i2c_bus_tmp->next_hop[i].mux.id,
-                                       i2c_bus_tmp->next_hop[i].chip,
-                                       i2c_bus_tmp->next_hop[i].channel);
-                       if (ret != 0)
-                               return ret;
-               }
-       }
        return 0;
 }
 
@@ -140,26 +123,6 @@ static int i2c_mux_disconnect_all(void)
        if (I2C_ADAP->init_done == 0)
                return 0;
 
-       /* Disconnect current bus (turn off muxes if any) */
-       if ((i2c_bus_tmp->next_hop[0].chip != 0) &&
-           (I2C_ADAP->init_done != 0)) {
-               i = CFG_SYS_I2C_MAX_HOPS;
-               do {
-                       uint8_t chip;
-                       int ret;
-
-                       chip = i2c_bus_tmp->next_hop[--i].chip;
-                       if (chip == 0)
-                               continue;
-
-                       ret = I2C_ADAP->write(I2C_ADAP, chip, 0, 0, &buf, 1);
-                       if (ret != 0) {
-                               printf("i2c: mux disconnect error\n");
-                               return ret;
-                       }
-               } while (i > 0);
-       }
-
        return 0;
 }
 #endif

diff --git a/include/i2c.h b/include/i2c.h
index f468b52cd7b01b8d5fcd476393d430c402057b95..180b71f145152a56b355083878d6079831e7c4cb 100644 (file)
--- a/include/i2c.h
+++ b/include/i2c.h
@@ -645,15 +645,9 @@ void i2c_early_init_f(void);
  */
 #define I2C_RXTX_LEN   128     /* maximum tx/rx buffer length */
 
-#if !defined(CFG_SYS_I2C_MAX_HOPS)
 /* no muxes used bus = i2c adapters */
 #define CFG_SYS_I2C_DIRECT_BUS 1
-#define CFG_SYS_I2C_MAX_HOPS           0
 #define CFG_SYS_NUM_I2C_BUSES  ll_entry_count(struct i2c_adapter, i2c)
-#else
-/* we use i2c muxes */
-#undef CFG_SYS_I2C_DIRECT_BUS
-#endif
 
 struct i2c_adapter {
        void            (*init)(struct i2c_adapter *adap, int speed,
@@ -712,7 +706,6 @@ struct i2c_next_hop {
 
 struct i2c_bus_hose {
        int     adapter;
-       struct i2c_next_hop     next_hop[CFG_SYS_I2C_MAX_HOPS];
 };
 #define I2C_NULL_HOP   {{-1, ""}, 0, 0}
 extern struct i2c_bus_hose     i2c_bus[];