diff options
| author | Heiko Schocher <hs@denx.de> | 2012-10-25 10:32:14 +0200 |
|---|---|---|
| committer | Heiko Schocher <hs@denx.de> | 2013-07-23 08:34:53 +0200 |
| commit | 9a2accb44f871af9c87c34d1c9ac95010f4e6f09 (patch) | |
| tree | f4fdbb502b7cd8572f848e20db5321bc2f07d30d /arch/powerpc/cpu/mpc8260 | |
| parent | 00f792e0df9ae942427e44595a0f4379582accee (diff) | |
| download | blackbird-obmc-uboot-9a2accb44f871af9c87c34d1c9ac95010f4e6f09.tar.gz blackbird-obmc-uboot-9a2accb44f871af9c87c34d1c9ac95010f4e6f09.zip | |
i2c, multibus: get rid of CONFIG_I2C_MUX
CONFIG_I2C_MUX is replaced through the new i2c multibus/multiadapter
framework, configured through CONFIG_SYS_I2C. As CONFIG_I2C_MUX
is only used on the keymile boards, and they are now completely
moved to the new framework, remove CONFIG_I2C_MUX.
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Holger Brunck <holger.brunck@keymile.com>
Tested-By: Holger Brunck <holger.brunck@keymile.com>
Diffstat (limited to 'arch/powerpc/cpu/mpc8260')
| -rw-r--r-- | arch/powerpc/cpu/mpc8260/i2c.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/powerpc/cpu/mpc8260/i2c.c b/arch/powerpc/cpu/mpc8260/i2c.c index e2341e9c39..bbbe4041af 100644 --- a/arch/powerpc/cpu/mpc8260/i2c.c +++ b/arch/powerpc/cpu/mpc8260/i2c.c @@ -746,23 +746,9 @@ unsigned int i2c_get_bus_num(void) int i2c_set_bus_num(unsigned int bus) { -#if defined(CONFIG_I2C_MUX) - if (bus < CONFIG_SYS_MAX_I2C_BUS) { - i2c_bus_num = bus; - } else { - int ret; - - ret = i2x_mux_select_mux(bus); - if (ret == 0) - i2c_bus_num = bus; - else - return ret; - } -#else if (bus >= CONFIG_SYS_MAX_I2C_BUS) return -1; i2c_bus_num = bus; -#endif return 0; } |
