aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-davinci
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r--arch/arm/mach-davinci/da850.c6
-rw-r--r--arch/arm/mach-davinci/include/mach/mux.h2
2 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c
index 4a43ae2bec09..22205a3727a7 100644
--- a/arch/arm/mach-davinci/da850.c
+++ b/arch/arm/mach-davinci/da850.c
@@ -287,6 +287,7 @@ static struct clk emac_clk = {
287 .name = "emac", 287 .name = "emac",
288 .parent = &pll0_sysclk4, 288 .parent = &pll0_sysclk4,
289 .lpsc = DA8XX_LPSC1_CPGMAC, 289 .lpsc = DA8XX_LPSC1_CPGMAC,
290 .psc_ctlr = 1,
290}; 291};
291 292
292static struct davinci_clk da850_clks[] = { 293static struct davinci_clk da850_clks[] = {
@@ -370,6 +371,8 @@ static const struct mux_config da850_pins[] = {
370 MUX_CFG(DA850, MII_RXD_2, 3, 20, 15, 8, false) 371 MUX_CFG(DA850, MII_RXD_2, 3, 20, 15, 8, false)
371 MUX_CFG(DA850, MII_RXD_1, 3, 24, 15, 8, false) 372 MUX_CFG(DA850, MII_RXD_1, 3, 24, 15, 8, false)
372 MUX_CFG(DA850, MII_RXD_0, 3, 28, 15, 8, false) 373 MUX_CFG(DA850, MII_RXD_0, 3, 28, 15, 8, false)
374 MUX_CFG(DA850, MDIO_CLK, 4, 0, 15, 8, false)
375 MUX_CFG(DA850, MDIO_D, 4, 4, 15, 8, false)
373#endif 376#endif
374}; 377};
375 378
@@ -402,7 +405,8 @@ const short da850_cpgmac_pins[] __initdata = {
402 DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3, 405 DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,
403 DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER, 406 DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,
404 DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3, 407 DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3,
405 DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, 408 DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK,
409 DA850_MDIO_D,
406 -1 410 -1
407}; 411};
408 412
diff --git a/arch/arm/mach-davinci/include/mach/mux.h b/arch/arm/mach-davinci/include/mach/mux.h
index a676b2f47aab..8676680fc5b6 100644
--- a/arch/arm/mach-davinci/include/mach/mux.h
+++ b/arch/arm/mach-davinci/include/mach/mux.h
@@ -748,6 +748,8 @@ enum davinci_da850_index {
748 DA850_MII_RXD_2, 748 DA850_MII_RXD_2,
749 DA850_MII_RXD_1, 749 DA850_MII_RXD_1,
750 DA850_MII_RXD_0, 750 DA850_MII_RXD_0,
751 DA850_MDIO_CLK,
752 DA850_MDIO_D,
751}; 753};
752 754
753#ifdef CONFIG_DAVINCI_MUX 755#ifdef CONFIG_DAVINCI_MUX