diff options
| author | Tom Rini <trini@konsulko.com> | 2017-08-10 11:22:59 (GMT) |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-08-10 11:22:59 (GMT) |
| commit | b24065c4ef21687787a74eef22dfa9232096f965 (patch) | |
| tree | b6fcc2d1e4f2bad093c1cc335e0523847026f4aa /arch | |
| parent | 4edc31c5931b22e06f33a33d9a8f30cc3248cf1e (diff) | |
| parent | 014e47f028526689aaa8ecb2e9164572937afe44 (diff) | |
| download | u-boot-fsl-qoriq-b24065c4ef21687787a74eef22dfa9232096f965.tar.xz | |
Merge git://git.denx.de/u-boot-i2c
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-omap2/Kconfig | 5 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/omap3/clock.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig index 013586e..89c91d1 100644 --- a/arch/arm/mach-omap2/Kconfig +++ b/arch/arm/mach-omap2/Kconfig @@ -22,6 +22,7 @@ config OMAP34XX imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT + imply SYS_I2C_OMAP24XX imply SYS_THUMB_BUILD imply TWL4030_POWER @@ -40,6 +41,7 @@ config OMAP44XX imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT + imply SYS_I2C_OMAP24XX imply SYS_THUMB_BUILD config OMAP54XX @@ -59,6 +61,7 @@ config OMAP54XX imply SPL_NAND_SUPPORT imply SPL_POWER_SUPPORT imply SPL_SERIAL_SUPPORT + imply SYS_I2C_OMAP24XX config TI814X bool "TI814X SoC" @@ -82,6 +85,7 @@ config AM43XX imply SPL_OF_TRANSLATE imply SPL_SEPARATE_BSS imply SPL_SYS_MALLOC_SIMPLE + imply SYS_I2C_OMAP24XX imply SYS_THUMB_BUILD help Support for AM43xx SOC from Texas Instruments. @@ -92,6 +96,7 @@ config AM43XX config AM33XX bool "AM33XX SoC" + imply SYS_I2C_OMAP24XX imply SYS_THUMB_BUILD imply USE_TINY_PRINTF help diff --git a/arch/arm/mach-omap2/omap3/clock.c b/arch/arm/mach-omap2/omap3/clock.c index 006969e..3daae61 100644 --- a/arch/arm/mach-omap2/omap3/clock.c +++ b/arch/arm/mach-omap2/omap3/clock.c @@ -772,7 +772,7 @@ void per_clocks_enable(void) setbits_le32(&prcm_base->iclken_per, 0x00020000); #endif -#ifdef CONFIG_SYS_I2C_OMAP34XX +#ifdef CONFIG_SYS_I2C_OMAP24XX /* Turn on all 3 I2C clocks */ setbits_le32(&prcm_base->fclken1_core, 0x00038000); setbits_le32(&prcm_base->iclken1_core, 0x00038000); /* I2C1,2,3 = on */ |