diff options
author | Heiko Schocher <hs@denx.de> | 2012-10-24 13:48:22 +0200 |
---|---|---|
committer | Heiko Schocher <hs@denx.de> | 2013-07-23 08:34:53 +0200 |
commit | 00f792e0df9ae942427e44595a0f4379582accee (patch) | |
tree | 34bfe42e8b720ed412ffa481b916a36fb1adcd60 /board/freescale/mpc8349itx | |
parent | ea818dbbcd59300b56014ac2d67798a54994eb9b (diff) | |
download | u-boot-imx-00f792e0df9ae942427e44595a0f4379582accee.zip u-boot-imx-00f792e0df9ae942427e44595a0f4379582accee.tar.gz u-boot-imx-00f792e0df9ae942427e44595a0f4379582accee.tar.bz2 |
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/freescale/mpc8349itx')
-rw-r--r-- | board/freescale/mpc8349itx/mpc8349itx.c | 3 | ||||
-rw-r--r-- | board/freescale/mpc8349itx/pci.c | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/board/freescale/mpc8349itx/mpc8349itx.c b/board/freescale/mpc8349itx/mpc8349itx.c index 9cc808e..271768d 100644 --- a/board/freescale/mpc8349itx/mpc8349itx.c +++ b/board/freescale/mpc8349itx/mpc8349itx.c @@ -263,8 +263,7 @@ int misc_init_r(void) { int rc = 0; -#ifdef CONFIG_HARD_I2C - +#if defined(CONFIG_SYS_I2C) unsigned int orig_bus = i2c_get_bus_num(); u8 i2c_data; diff --git a/board/freescale/mpc8349itx/pci.c b/board/freescale/mpc8349itx/pci.c index 7d30d9b..1ab4e0c 100644 --- a/board/freescale/mpc8349itx/pci.c +++ b/board/freescale/mpc8349itx/pci.c @@ -87,7 +87,7 @@ void pci_init_board(void) #endif u8 reg8; -#ifdef CONFIG_HARD_I2C +#if defined(CONFIG_SYS_I2C) i2c_set_bus_num(1); /* Read the PCI_M66EN jumper setting */ if ((i2c_read(CONFIG_SYS_I2C_8574_ADDR2, 0, 0, ®8, sizeof(reg8)) == 0) || |