diff options
author | Heiko Schocher <hs@denx.de> | 2012-10-24 11:48:22 (GMT) |
---|---|---|
committer | Heiko Schocher <hs@denx.de> | 2013-07-23 06:34:53 (GMT) |
commit | 00f792e0df9ae942427e44595a0f4379582accee (patch) | |
tree | 34bfe42e8b720ed412ffa481b916a36fb1adcd60 /board/keymile | |
parent | ea818dbbcd59300b56014ac2d67798a54994eb9b (diff) | |
download | u-boot-fsl-qoriq-00f792e0df9ae942427e44595a0f4379582accee.tar.xz |
i2c, fsl_i2c: switch to new multibus/multiadapter support
- added to fsl_i2c driver new multibus/multiadpater support
- adapted all config files, which uses this driver
Signed-off-by: Heiko Schocher <hs@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Stephen Warren <swarren@wwwdotorg.org>
Diffstat (limited to 'board/keymile')
-rw-r--r-- | board/keymile/common/ivm.c | 16 | ||||
-rw-r--r-- | board/keymile/km83xx/km83xx.c | 15 |
2 files changed, 0 insertions, 31 deletions
diff --git a/board/keymile/common/ivm.c b/board/keymile/common/ivm.c index 918a6ab..a14496f 100644 --- a/board/keymile/common/ivm.c +++ b/board/keymile/common/ivm.c @@ -314,29 +314,13 @@ int ivm_analyze_eeprom(unsigned char *buf, int len) int ivm_read_eeprom(void) { -#if defined(CONFIG_I2C_MUX) - I2C_MUX_DEVICE *dev = NULL; -#endif uchar i2c_buffer[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; char *buf; unsigned long dev_addr = CONFIG_SYS_IVM_EEPROM_ADR; int ret; -#if defined(CONFIG_SYS_I2C) buf = getenv("EEprom_ivm"); i2c_set_bus_num(buf ? (int)simple_strtol(buf, NULL, 10) : 0); -#else -#if defined(CONFIG_I2C_MUX) - /* First init the Bus, select the Bus */ - buf = (unsigned char *) getenv("EEprom_ivm"); - if (buf != NULL) - dev = i2c_mux_ident_muxstring(buf); - if (dev == NULL) { - printf("Error couldnt add Bus for IVM\n"); - return -1; - } - i2c_set_bus_num(dev->busid); -#endif /* add deblocking here */ i2c_make_abort(); diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c index faaa39b..6d45809 100644 --- a/board/keymile/km83xx/km83xx.c +++ b/board/keymile/km83xx/km83xx.c @@ -95,19 +95,6 @@ const qe_iop_conf_t qe_iop_conf_tab[] = { {0, 0, 0, 0, QE_IOP_TAB_END}, }; -static int board_init_i2c_busses(void) -{ - I2C_MUX_DEVICE *dev = NULL; - uchar *dtt_bus = (uchar *)"pca9547:70:a"; - - /* Set up the Bus for the DTTs */ - dev = i2c_mux_ident_muxstring(dtt_bus); - if (dev == NULL) - printf("Error couldn't add Bus for DTT\n"); - - return 0; -} - #if defined(CONFIG_SUVD3) const uint upma_table[] = { 0x1ffedc00, 0x0ffcdc80, 0x0ffcdc80, 0x0ffcdc04, /* Words 0 to 3 */ @@ -206,8 +193,6 @@ int board_early_init_r(void) int misc_init_r(void) { - /* add board specific i2c busses */ - board_init_i2c_busses(); return 0; } |