Revert "ARM: davinci: da850: Manual pinmux only when PINCTRL not available"
PATCH 1/1 Revert "ARM: davinci: da850: Manual pinmux only when PINCTRL not available"
This reverts commit 877ab2423bc257045a06bc23d4b9440b82bda6fb.
The above patch was designed to shrink code by only pin-muxing items needed for SPL in SPL and relying on driver model or SPL to mux other items. Unfortunately, da850evm_direct_nor doesn't use SPL so items that were only muxed during SPL are not muxed causing the board to no longer boot.
board/davinci/da8xxevm/da850evm.c +2 -12
@@ -215,29 +215,21 @@ static const struct pinmux_config gpio_pins[] = { }; const struct pinmux_resource pinmuxes[] = { -#ifndef CONFIG_SPL_BUILD #ifdef CONFIG_DRIVER_TI_EMAC PINMUX_ITEM(emac_pins_mdio),#ifdef CONFIG_DRIVER_TI_EMAC_USE_RMII PINMUX_ITEM(emac_pins_rmii), #else PINMUX_ITEM(emac_pins_mii), -#endif /* CONFIG_DRIVER_TI_EMAC */ -#endif /* CONFIG_DRIVER_TI_EMAC_USE_RMII */ -#endif /* CONFIG_SPL_BUILD */ +#endif +#endif #ifdef CONFIG_SPI_FLASH -#if !CONFIG_IS_ENABLED (PINCTRL )PINMUX_ITEM (spi1_pins_base),PINMUX_ITEM (spi1_pins_scs0), #endif -#endif -#if !CONFIG_IS_ENABLED (PINCTRL )PINMUX_ITEM (uart2_pins_txrx),PINMUX_ITEM (uart2_pins_rtscts), -#endif -#if !CONFIG_IS_ENABLED(PINCTRL)PINMUX_ITEM (i2c0_pins), -#endif #ifdef CONFIG_NAND_DAVINCIPINMUX_ITEM (emifa_pins_cs3), PINMUX_ITEM(emifa_pins_cs4),
@@ -248,10 +240,8 @@ const struct pinmux_resource pinmuxes[] = {#endif PINMUX_ITEM(gpio_pins), #ifdef CONFIG_MMC_DAVINCI -#if !CONFIG_IS_ENABLED (PINCTRL ) PINMUX_ITEM(mmc0_pins), #endif -#endif };const int pinmuxes_size =ARRAY_SIZE (pinmuxes);
Signature · 1 line
2.17.1
PATCH 1/1 Revert "ARM: davinci: da850: Manual pinmux only when PINCTRL not available"
board/davinci/da8xxevm/da850evm.c
Quoted 12 lines · Adam Ford
This reverts commit
877ab2423bc257045a06bc23d4b9440b82bda6fb.The above patch was designed to shrink code by only pin-muxing items needed for SPL in SPL and relying on driver model or SPL to mux other items. Unfortunately,
da850evm_direct_nordoesn't use SPL so items that were only muxed during SPL are not muxed causing the board to no longer boot.Signed-off-by Adam Ford <[email protected]>board/davinci/da8xxevm/da850evm.c +0
-0
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 819 bytes Desc: not available URL: <http://lists.denx.de/pipermail/u-boot/attachments/20190731/50a36527/attachment.sig>