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>

diff --git a/board/logicpd/am3517evm/am3517evm.c b/board/logicpd/am3517evm/am3517evm.c
index da8be22085689f70296554ce0099654f30d4a6a8..6f728398c38dff1c6b8301574b2c9e6fb0cc225b 100644 (file)
--- 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 1fe81d8934b757311f4aed9e2d72e7476a42cd4a..a3d261bbba9eb9a34549ff264b43593086b086b9 100644 (file)
--- 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 */