diff options
| author | Adam Ford <aford173@gmail.com> | 2018-08-19 11:11:03 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-09-11 21:48:04 -0400 |
| commit | 819ad5f625b17d189c5dcaec377c451fd3266def (patch) | |
| tree | cd7fddd18fa4837d4f9be85bf2e77deda3e16017 | |
| parent | 8cd21a63463318b1f7c90778da364dd649c27ca9 (diff) | |
ARM: am3517_evm: Disable DM_I2C_COMPAT
DM_I2C_COMPAT is somehow being enabled outside of Kconfig, so
this explicitly undefines it in the header file, and brackets
the I2C initialization around an #ifdef to not manually
initialize the I2C controller when the DM_I2C is enabled.
Signed-off-by: Adam Ford <aford173@gmail.com>
Tested-by: Derald D. Woods <woods.technical@gmail.com>
| -rw-r--r-- | board/logicpd/am3517evm/am3517evm.c | 3 | ||||
| -rw-r--r-- | include/configs/am3517_evm.h | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c index da8be22085..6f728398c3 100644 --- a/board/logicpd/am3517evm/am3517evm.c +++ b/board/logicpd/am3517evm/am3517evm.c @@ -108,10 +108,11 @@ int misc_init_r(void) volatile unsigned int ctr; u32 reset; +#if !defined(CONFIG_DM_I2C) #ifdef CONFIG_SYS_I2C_OMAP24XX i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE); #endif - +#endif omap_die_id_display(); am3517_evm_musb_init(); diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index 1fe81d8934..a3d261bbba 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -23,8 +23,9 @@ #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000 #include <configs/ti_omap3_common.h> -#undef CONFIG_SDRC /* Disable SDRC since we have EMIF4 */ +#undef CONFIG_DM_I2C_COMPAT +#define CONFIG_MISC_INIT_R #define CONFIG_REVISION_TAG /* Hardware drivers */ |