leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: am3517_evm: Disable DM_I2C_COMPAT

Browse Source 
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>
This commit is contained in:
Adam Ford 2018-08-19 11:11:03 -05:00 committed by Tom Rini
parent 8cd21a6346
commit 819ad5f625
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
board/logicpd/am3517evm/am3517evm.c
View File

@ -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();

3
include/configs/am3517_evm.h
View File

@ -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 */