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/mcf532x | |
| parent | ea818dbbcd59300b56014ac2d67798a54994eb9b (diff) | |
| download | talos-obmc-uboot-00f792e0df9ae942427e44595a0f4379582accee.tar.gz talos-obmc-uboot-00f792e0df9ae942427e44595a0f4379582accee.zip | |
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/mcf532x')
| -rw-r--r-- | arch/m68k/cpu/mcf532x/cpu_init.c | 4 | ||||
| -rw-r--r-- | arch/m68k/cpu/mcf532x/speed.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/arch/m68k/cpu/mcf532x/cpu_init.c b/arch/m68k/cpu/mcf532x/cpu_init.c index f571fadc35..bd7672d6f4 100644 --- a/arch/m68k/cpu/mcf532x/cpu_init.c +++ b/arch/m68k/cpu/mcf532x/cpu_init.c @@ -98,7 +98,7 @@ void cpu_init_f(void) out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK); #endif -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_I2C_FSL out_8(&gpio->par_feci2c, GPIO_PAR_FECI2C_SDA_SDA | GPIO_PAR_FECI2C_SCL_SCL); #endif @@ -292,7 +292,7 @@ void cpu_init_f(void) out_be32(&fbcs->csmr5, CONFIG_SYS_CS5_MASK); #endif -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_I2C_FSL out_8(&gpio->par_feci2c, GPIO_PAR_FECI2C_SCL_SCL | GPIO_PAR_FECI2C_SDA_SDA); #endif diff --git a/arch/m68k/cpu/mcf532x/speed.c b/arch/m68k/cpu/mcf532x/speed.c index 8efb451dc1..6e1d6a58e5 100644 --- a/arch/m68k/cpu/mcf532x/speed.c +++ b/arch/m68k/cpu/mcf532x/speed.c @@ -270,7 +270,7 @@ int get_clocks(void) gd->bus_clk = clock_pll(CONFIG_SYS_CLK / 1000, 0) * 1000; gd->cpu_clk = (gd->bus_clk * 3); -#ifdef CONFIG_FSL_I2C +#ifdef CONFIG_SYS_I2C_FSL gd->arch.i2c1_clk = gd->bus_clk; #endif |
