dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-24 12:02:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

Revert "ARM: davinci: da850: Manual pinmux only when PINCTRL not available"

Browse Source 
This reverts commit 877ab2423b.

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.

Signed-off-by: Adam Ford <aford173@gmail.com>
This commit is contained in:
Adam Ford
2019-07-31 09:17:31 -05:00
committed by Tom Rini
parent 51443f57d8
commit b9ad74d901
1 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
board/davinci/da8xxevm/da850evm.c
View File

@@ -215,29 +215,21 @@ static const struct pinmux_config gpio_pins[] = {
}; };
const struct pinmux_resource pinmuxes[] = { const struct pinmux_resource pinmuxes[] = {
#ifndef CONFIG_SPL_BUILD
#ifdef CONFIG_DRIVER_TI_EMAC #ifdef CONFIG_DRIVER_TI_EMAC
PINMUX_ITEM(emac_pins_mdio), PINMUX_ITEM(emac_pins_mdio),
#ifdef CONFIG_DRIVER_TI_EMAC_USE_RMII #ifdef CONFIG_DRIVER_TI_EMAC_USE_RMII
PINMUX_ITEM(emac_pins_rmii), PINMUX_ITEM(emac_pins_rmii),
#else #else
PINMUX_ITEM(emac_pins_mii), PINMUX_ITEM(emac_pins_mii),
#endif /* CONFIG_DRIVER_TI_EMAC */ #endif
#endif /* CONFIG_DRIVER_TI_EMAC_USE_RMII */ #endif
#endif /* CONFIG_SPL_BUILD */
#ifdef CONFIG_SPI_FLASH #ifdef CONFIG_SPI_FLASH
#if !CONFIG_IS_ENABLED(PINCTRL)
PINMUX_ITEM(spi1_pins_base), PINMUX_ITEM(spi1_pins_base),
PINMUX_ITEM(spi1_pins_scs0), PINMUX_ITEM(spi1_pins_scs0),
#endif #endif
#endif
#if !CONFIG_IS_ENABLED(PINCTRL)
PINMUX_ITEM(uart2_pins_txrx), PINMUX_ITEM(uart2_pins_txrx),
PINMUX_ITEM(uart2_pins_rtscts), PINMUX_ITEM(uart2_pins_rtscts),
#endif
#if !CONFIG_IS_ENABLED(PINCTRL)
PINMUX_ITEM(i2c0_pins), PINMUX_ITEM(i2c0_pins),
#endif
#ifdef CONFIG_NAND_DAVINCI #ifdef CONFIG_NAND_DAVINCI
PINMUX_ITEM(emifa_pins_cs3), PINMUX_ITEM(emifa_pins_cs3),
PINMUX_ITEM(emifa_pins_cs4), PINMUX_ITEM(emifa_pins_cs4),
@@ -248,10 +240,8 @@ const struct pinmux_resource pinmuxes[] = {
#endif #endif
PINMUX_ITEM(gpio_pins), PINMUX_ITEM(gpio_pins),
#ifdef CONFIG_MMC_DAVINCI #ifdef CONFIG_MMC_DAVINCI
#if !CONFIG_IS_ENABLED(PINCTRL)
PINMUX_ITEM(mmc0_pins), PINMUX_ITEM(mmc0_pins),
#endif #endif
#endif
}; };
const int pinmuxes_size = ARRAY_SIZE(pinmuxes); const int pinmuxes_size = ARRAY_SIZE(pinmuxes);