| Message ID | 1248323786-12082-1-git-send-email-sudhakar.raj@ti.com (mailing list archive) |
|---|---|
| State | Rejected |
| Headers | show |
Sudhakar Rajashekhara <sudhakar.raj@ti.com> writes: > 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> Looks fine. > --- > This patch depends on the following patch which I have > submitted to davinci git: > [PATCH] davinci: Add MMC/SD support for da850/omap-l138 Either re-send based on master, or I'll have to wait for an updated MMC/SD patch. Kevin > arch/arm/mach-davinci/da850.c | 6 +++++- > arch/arm/mach-davinci/include/mach/mux.h | 2 ++ > 2 files changed, 7 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c > index 4b5ac24..dc7ca1d 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 clk mmcsd_clk = { > @@ -377,6 +378,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) > /* MMC/SD0 function */ > MUX_CFG(DA850, MMCSD0_DAT_0, 10, 8, 15, 2, false) > MUX_CFG(DA850, MMCSD0_DAT_1, 10, 12, 15, 2, false) > @@ -416,7 +419,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 09dbede..f5febdd 100644 > --- a/arch/arm/mach-davinci/include/mach/mux.h > +++ b/arch/arm/mach-davinci/include/mach/mux.h > @@ -747,6 +747,8 @@ enum davinci_da850_index { > DA850_MII_RXD_2, > DA850_MII_RXD_1, > DA850_MII_RXD_0, > + DA850_MDIO_CLK, > + DA850_MDIO_D, > > /* MMC/SD0 function */ > DA850_MMCSD0_DAT_0, > -- > 1.5.6 > > _______________________________________________ > Davinci-linux-open-source mailing list > Davinci-linux-open-source@linux.davincidsp.com > http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index 4b5ac24..dc7ca1d 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 clk mmcsd_clk = { @@ -377,6 +378,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) /* MMC/SD0 function */ MUX_CFG(DA850, MMCSD0_DAT_0, 10, 8, 15, 2, false) MUX_CFG(DA850, MMCSD0_DAT_1, 10, 12, 15, 2, false) @@ -416,7 +419,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 09dbede..f5febdd 100644 --- a/arch/arm/mach-davinci/include/mach/mux.h +++ b/arch/arm/mach-davinci/include/mach/mux.h @@ -747,6 +747,8 @@ enum davinci_da850_index { DA850_MII_RXD_2, DA850_MII_RXD_1, DA850_MII_RXD_0, + DA850_MDIO_CLK, + DA850_MDIO_D, /* MMC/SD0 function */ DA850_MMCSD0_DAT_0,
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> --- This patch depends on the following patch which I have submitted to davinci git: [PATCH] davinci: Add MMC/SD support for da850/omap-l138 arch/arm/mach-davinci/da850.c | 6 +++++- arch/arm/mach-davinci/include/mach/mux.h | 2 ++ 2 files changed, 7 insertions(+), 1 deletions(-)