davinci: Configure MDIO pins for EMAC

Earlier patch which adds EMAC support for da850/omap-l138
was not configuring the MDIO pins.

Ethernet was working fine with the earlier patch, because
the MDIO pins were configured from the boot loader. This
patch removes that dependency.

Also, this patch populates a member in the emac clk structure
to say that EMAC LPSC sits on controller 1.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

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 = {
         .name           = "emac",
         .parent         = &pll0_sysclk4,
         .lpsc           = DA8XX_LPSC1_CPGMAC,
+        .psc_ctlr       = 1,
 };
 
 static struct davinci_clk da850_clks[] = {
@@ -370,6 +371,8 @@ static const struct mux_config da850_pins[] = {
         MUX_CFG(DA850, MII_RXD_2,       3,      20,     15,     8,      false)
         MUX_CFG(DA850, MII_RXD_1,       3,      24,     15,     8,      false)
         MUX_CFG(DA850, MII_RXD_0,       3,      28,     15,     8,      false)
+        MUX_CFG(DA850, MDIO_CLK,        4,      0,      15,     8,      false)
+        MUX_CFG(DA850, MDIO_D,          4,      4,      15,     8,      false)
 #endif
 };
 
@@ -402,7 +405,8 @@ const short da850_cpgmac_pins[] __initdata = {
         DA850_MII_TXEN, DA850_MII_TXCLK, DA850_MII_COL, DA850_MII_TXD_3,
         DA850_MII_TXD_2, DA850_MII_TXD_1, DA850_MII_TXD_0, DA850_MII_RXER,
         DA850_MII_CRS, DA850_MII_RXCLK, DA850_MII_RXDV, DA850_MII_RXD_3,
-        DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0,
+        DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, DA850_MDIO_CLK,
+        DA850_MDIO_D,
         -1
 };
 
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 {
         DA850_MII_RXD_2,
         DA850_MII_RXD_1,
         DA850_MII_RXD_0,
+        DA850_MDIO_CLK,
+        DA850_MDIO_D,
 };
 
 #ifdef CONFIG_DAVINCI_MUX