[U-Boot] [PATCH 1/2] Configs: am3517_evm: Remove TWL4030 reference
This SOM and kit do not nor have they ever had a twl4030 PMIC. This patch removes the references to it.
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 41ab3fd373..61a401c4c1 100644 --- a/configs/am3517_evm_defconfig +++ b/configs/am3517_evm_defconfig @@ -43,6 +43,7 @@ CONFIG_SYS_NAND_BUSWIDTH_16BIT=y CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +# CONFIG_TWL4030_POWER is not set CONFIG_CONS_INDEX=3 CONFIG_SYS_NS16550=y CONFIG_SPI=y
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
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 c767961562..507f12ef9e 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -25,8 +25,8 @@ #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
On Sun, Aug 19, 2018 at 11:11:03AM -0500, Adam Ford wrote:
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
There are some merge conflicts, but otherwise the changes here and patch 1 of the series allow DM_I2C without compatibility.
[...] AM3517_EVM # i2c dev 0 Setting bus to 0 AM3517_EVM # i2c probe Valid chip addresses: 30 31 32 33 34 35 36 37 48 4B AM3517_EVM # i2c dev 1 Setting bus to 1 AM3517_EVM # i2c probe Valid chip addresses: 21 [...]
Tested-by: Derald D. Woods woods.technical@gmail.com
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 c767961562..507f12ef9e 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -25,8 +25,8 @@ #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
-- 2.17.1
U-Boot mailing list U-Boot@lists.denx.de https://lists.denx.de/listinfo/u-boot
On Sun, Aug 19, 2018 at 11:11:03AM -0500, Adam Ford wrote:
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 da8be22085..6f728398c3 100644
Applied to u-boot/master, thanks!
On Sun, Aug 19, 2018 at 11:11:02AM -0500, Adam Ford wrote:
This SOM and kit do not nor have they ever had a twl4030 PMIC. This patch removes the references to it.
Signed-off-by: Adam Ford aford173@gmail.com
diff --git a/configs/am3517_evm_defconfig b/configs/am3517_evm_defconfig index 41ab3fd373..61a401c4c1 100644
Applied to u-boot/master, thanks!
participants (3)
-
Adam Ford -
Derald D. Woods -
Tom Rini