summaryrefslogtreecommitdiff
path: root/board/davinci/da8xxevm/da850evm.c
diff options
context:
space:
mode:
authorChristian Riesch <christian.riesch@omicron.at>2011-11-28 23:46:16 +0000
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2011-12-06 23:59:36 +0100
commit591d8019a13f1104f87257071ee9d934a7f4a4fe (patch)
tree14a38398529c4845158ff32708dd49686ecb7212 /board/davinci/da8xxevm/da850evm.c
parente5b9aa9e9c0bdd536177e8ab8071be30d2a0e7d9 (diff)
downloadu-boot-imx-591d8019a13f1104f87257071ee9d934a7f4a4fe.zip
u-boot-imx-591d8019a13f1104f87257071ee9d934a7f4a4fe.tar.gz
u-boot-imx-591d8019a13f1104f87257071ee9d934a7f4a4fe.tar.bz2
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>
Diffstat (limited to 'board/davinci/da8xxevm/da850evm.c')
-rw-r--r--board/davinci/da8xxevm/da850evm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c
index 844e585..9b68c5c 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 */