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 /arch/m68k/cpu/mcf52x2/cpu_init.c | |
| 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 'arch/m68k/cpu/mcf52x2/cpu_init.c')
| -rw-r--r-- | arch/m68k/cpu/mcf52x2/cpu_init.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/m68k/cpu/mcf52x2/cpu_init.c b/arch/m68k/cpu/mcf52x2/cpu_init.c index 5d0e9f0..5d01670 100644 --- a/arch/m68k/cpu/mcf52x2/cpu_init.c +++ b/arch/m68k/cpu/mcf52x2/cpu_init.c @@ -228,7 +228,7 @@ void cpu_init_f(void) /* FlexBus Chipselect */ init_fbcs(); -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_I2C_FSL CONFIG_SYS_I2C_PINMUX_REG = CONFIG_SYS_I2C_PINMUX_REG & CONFIG_SYS_I2C_PINMUX_CLR; CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET; @@ -498,7 +498,7 @@ void cpu_init_f(void) init_fbcs(); #endif /* #ifndef CONFIG_MONITOR_IS_IN_RAM */ -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_I2C_FSL CONFIG_SYS_I2C_PINMUX_REG &= CONFIG_SYS_I2C_PINMUX_CLR; CONFIG_SYS_I2C_PINMUX_REG |= CONFIG_SYS_I2C_PINMUX_SET; #endif |