From: Christian Riesch <christian.riesch@omicron.at>
Date: Mon, 28 Nov 2011 23:46:16 +0000 (+0000)
Subject: arm, da850evm: Do pinmux configuration for EMAC together with other pinmuxes
X-Git-Tag: v2011.12-rc1~60^2~45
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=591d8019a13f1104f87257071ee9d934a7f4a4fe;p=oweals%2Fu-boot.git

arm, da850evm: Do pinmux configuration for EMAC together with other pinmuxes

Pinmux configuration for the EMAC was done in a separate call
of davinci_configure_pin_mux(). This patch moves all the pinmux
configuration that is done for this board to a common place.

Signed-off-by: Christian Riesch <christian.riesch@omicron.at>
Cc: Heiko Schocher <hs@denx.de>
Cc: Sandeep Paulraj <s-paulraj@ti.com>
Cc: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Acked-by: Heiko Schocher <hs@denx.de>
---

diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 844e585f60..9b68c5cec5 100644
--- a/board/davinci/da8xxevm/da850evm.c
+++ b/board/davinci/da8xxevm/da850evm.c
@@ -223,6 +223,9 @@ int misc_init_r(void)
 }
 
 static const struct pinmux_resource pinmuxes[] = {
+#ifdef CONFIG_DRIVER_TI_EMAC
+	PINMUX_ITEM(emac_pins),
+#endif
 #ifdef CONFIG_SPI_FLASH
 	PINMUX_ITEM(spi1_pins),
 #endif
@@ -344,9 +347,6 @@ int board_init(void)
 #endif
 
 #ifdef CONFIG_DRIVER_TI_EMAC
-	if (davinci_configure_pin_mux(emac_pins, ARRAY_SIZE(emac_pins)) != 0)
-		return 1;
-
 	davinci_emac_mii_mode_sel(HAS_RMII);
 #endif /* CONFIG_DRIVER_TI_EMAC */