diff options
| author | Tom Rini <trini@ti.com> | 2013-10-17 12:09:49 -0400 |
|---|---|---|
| committer | Tom Rini <trini@ti.com> | 2013-10-17 12:09:49 -0400 |
| commit | 9dff87a297dabe4af60012ad2d990ff8967f1d55 (patch) | |
| tree | 484a3f5785536d6996c68f538b48590d71b6bd8c /arch | |
| parent | 287df01e6aef0464c5e5bcbd7e87aa4ff1f24f5a (diff) | |
| parent | 9a2a73d29fa395f42f3fb477ac99dda4d7f2f21f (diff) | |
| download | u-boot-imx-9dff87a297dabe4af60012ad2d990ff8967f1d55.zip u-boot-imx-9dff87a297dabe4af60012ad2d990ff8967f1d55.tar.gz u-boot-imx-9dff87a297dabe4af60012ad2d990ff8967f1d55.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/cpu/armv7/mx5/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx6/clock.c | 2 | ||||
| -rw-r--r-- | arch/arm/imx-common/Makefile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/cpu/armv7/mx5/clock.c b/arch/arm/cpu/armv7/mx5/clock.c index 6bef254..fb3b128 100644 --- a/arch/arm/cpu/armv7/mx5/clock.c +++ b/arch/arm/cpu/armv7/mx5/clock.c @@ -94,7 +94,7 @@ void enable_usboh3_clk(bool enable) MXC_CCM_CCGR2_USBOH3_60M(cg)); } -#ifdef CONFIG_I2C_MXC +#ifdef CONFIG_SYS_I2C_MXC /* i2c_num can be from 0, to 1 for i.MX51 and 2 for i.MX53 */ int enable_i2c_clk(unsigned char enable, unsigned i2c_num) { diff --git a/arch/arm/cpu/armv7/mx6/clock.c b/arch/arm/cpu/armv7/mx6/clock.c index df11678..cf3a38e 100644 --- a/arch/arm/cpu/armv7/mx6/clock.c +++ b/arch/arm/cpu/armv7/mx6/clock.c @@ -48,7 +48,7 @@ void enable_usboh3_clk(unsigned char enable) } -#ifdef CONFIG_I2C_MXC +#ifdef CONFIG_SYS_I2C_MXC /* i2c_num can be from 0 - 2 */ int enable_i2c_clk(unsigned char enable, unsigned i2c_num) { diff --git a/arch/arm/imx-common/Makefile b/arch/arm/imx-common/Makefile index 727a052..6c78dd9 100644 --- a/arch/arm/imx-common/Makefile +++ b/arch/arm/imx-common/Makefile @@ -16,7 +16,7 @@ COBJS-y = iomux-v3.o endif ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) COBJS-y += timer.o cpu.o speed.o -COBJS-$(CONFIG_I2C_MXC) += i2c-mxv7.o +COBJS-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o endif ifeq ($(SOC),$(filter $(SOC),mx6 mxs)) COBJS-y += misc.o |