diff options
| author | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-12-10 07:16:33 -0500 |
| commit | 7ff485c68b7e5573e5a4a877066e98398283a24f (patch) | |
| tree | 8070ad8de0b18240ee67e1c8b847afc37bdb2d5d /arch/arm/mach-omap2/clocks-common.c | |
| parent | 7504e9e75f76a5101b47cd32851ad7bd4ea8ff70 (diff) | |
| parent | 19f8c4dfb6e744a31da59bdd23b24d144152f1dc (diff) | |
Merge branch 'master' of git://git.denx.de/u-boot-i2c
- DM_I2C_COMPAT removal for all ti platforms from Jean-Jacques Hiblot
- Fix in i2c command help output from Chirstoph Muellner.
Diffstat (limited to 'arch/arm/mach-omap2/clocks-common.c')
| -rw-r--r-- | arch/arm/mach-omap2/clocks-common.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/clocks-common.c b/arch/arm/mach-omap2/clocks-common.c index 790548ee799..5932d694d30 100644 --- a/arch/arm/mach-omap2/clocks-common.c +++ b/arch/arm/mach-omap2/clocks-common.c @@ -909,6 +909,7 @@ void prcm_init(void) enable_basic_uboot_clocks(); } +#if !defined(CONFIG_DM_I2C) void gpi2c_init(void) { static int gpi2c = 1; @@ -919,3 +920,4 @@ void gpi2c_init(void) gpi2c = 0; } } +#endif |