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/mcf5445x | |
| 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/mcf5445x')
| -rw-r--r-- | arch/m68k/cpu/mcf5445x/cpu_init.c | 2 | ||||
| -rw-r--r-- | arch/m68k/cpu/mcf5445x/speed.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/cpu/mcf5445x/cpu_init.c b/arch/m68k/cpu/mcf5445x/cpu_init.c index 6e947d0..3c53a7f 100644 --- a/arch/m68k/cpu/mcf5445x/cpu_init.c +++ b/arch/m68k/cpu/mcf5445x/cpu_init.c @@ -212,7 +212,7 @@ void cpu_init_f(void) GPIO_PAR_FBCTL_OE | GPIO_PAR_FBCTL_TA_TA | GPIO_PAR_FBCTL_RW_RW | GPIO_PAR_FBCTL_TS_TS); -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_FSL_I2C out_be16(&gpio->par_feci2c, GPIO_PAR_FECI2C_SCL_SCL | GPIO_PAR_FECI2C_SDA_SDA); #endif diff --git a/arch/m68k/cpu/mcf5445x/speed.c b/arch/m68k/cpu/mcf5445x/speed.c index 0276d4d..3b341b8 100644 --- a/arch/m68k/cpu/mcf5445x/speed.c +++ b/arch/m68k/cpu/mcf5445x/speed.c @@ -273,7 +273,7 @@ void setup_5445x_clocks(void) #endif } -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_I2C_FSL gd->arch.i2c1_clk = gd->bus_clk; #endif } @@ -289,7 +289,7 @@ int get_clocks(void) setup_5445x_clocks(); #endif -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_FSL_I2C gd->arch.i2c1_clk = gd->bus_clk; #endif |