Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 819ad5f625b17d189c5dcaec377c451fd3266def

Authored by Adam Ford
Committed by Tom Rini
1 parent 8cd21a6346
Exists in smarc_8mq_lf_v2020.04 and in 11 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

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>

Showing 2 changed files with 4 additions and 2 deletions Side-by-side Diff

board/logicpd/am3517evm/am3517evm.c
Diff comments   View file @ 819ad5f
... ... @@ -108,10 +108,11 @@
108 108 volatile unsigned int ctr;
109 109 u32 reset;
110 110  
  111 +#if !defined(CONFIG_DM_I2C)
111 112 #ifdef CONFIG_SYS_I2C_OMAP24XX
112 113 i2c_init(CONFIG_SYS_OMAP24_I2C_SPEED, CONFIG_SYS_OMAP24_I2C_SLAVE);
113 114 #endif
114   -
  115 +#endif
115 116 omap_die_id_display();
116 117  
117 118 am3517_evm_musb_init();
include/configs/am3517_evm.h
Diff comments   View file @ 819ad5f
... ... @@ -23,8 +23,9 @@
23 23 #define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
24 24  
25 25 #include <configs/ti_omap3_common.h>
26   -#undef CONFIG_SDRC /* Disable SDRC since we have EMIF4 */
27 26  
  27 +#undef CONFIG_DM_I2C_COMPAT
  28 +#define CONFIG_MISC_INIT_R
28 29 #define CONFIG_REVISION_TAG
29 30  
30 31 /* Hardware drivers */