* [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases
@ 2011-12-20 23:27 Ilya Yanok
2012-02-06 8:27 ` Yegor Yefremov
0 siblings, 1 reply; 7+ messages in thread
From: Ilya Yanok @ 2011-12-20 23:27 UTC (permalink / raw)
To: linux-omap; +Cc: sasha_d, Ilya Yanok, Paul Walmsley
Rename EMAC clocks to match driver expectations: both davinci_emac and
davinci_mdio drivers call clk_get(dev, NULL) so we have to provide
("davinci_emac", NULL) and ("davinci_mdio.0", NULL) clocks instead of
("davinci_emac", "emac_clk") and ("davinci_emac", "phy_clk") resp.
CC: Paul Walmsley <paul@pwsan.com>
Signed-off-by: Ilya Yanok <yanok@emcraft.com>
---
arch/arm/mach-omap2/clock3xxx_data.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index d75e5f6..1a60661 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3465,8 +3465,8 @@ static struct omap_clk omap3xxx_clks[] = {
CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX),
CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX),
CLK(NULL, "pclk_ck", &pclk_ck, CK_AM35XX),
- CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX),
- CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX),
+ CLK("davinci_emac", NULL, &emac_ick, CK_AM35XX),
+ CLK("davinci_mdio.0", NULL, &emac_fck, CK_AM35XX),
CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX),
CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX),
CLK("musb-am35x", "ick", &hsotgusb_ick_am35xx, CK_AM35XX),
--
1.7.6.4
^ permalink raw reply related [flat|nested] 7+ messages in thread* Re: [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases
2011-12-20 23:27 [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases Ilya Yanok
@ 2012-02-06 8:27 ` Yegor Yefremov
2012-02-09 19:09 ` Matt Porter
0 siblings, 1 reply; 7+ messages in thread
From: Yegor Yefremov @ 2012-02-06 8:27 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Ilya Yanok, linux-omap, sasha_d, Paul Walmsley
Am 21.12.2011 00:27, schrieb Ilya Yanok:
> Rename EMAC clocks to match driver expectations: both davinci_emac and
> davinci_mdio drivers call clk_get(dev, NULL) so we have to provide
> ("davinci_emac", NULL) and ("davinci_mdio.0", NULL) clocks instead of
> ("davinci_emac", "emac_clk") and ("davinci_emac", "phy_clk") resp.
>
> CC: Paul Walmsley <paul@pwsan.com>
> Signed-off-by: Ilya Yanok <yanok@emcraft.com>
> ---
> arch/arm/mach-omap2/clock3xxx_data.c | 4 ++--
> 1 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
> index d75e5f6..1a60661 100644
> --- a/arch/arm/mach-omap2/clock3xxx_data.c
> +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> @@ -3465,8 +3465,8 @@ static struct omap_clk omap3xxx_clks[] = {
> CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX),
> CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX),
> CLK(NULL, "pclk_ck", &pclk_ck, CK_AM35XX),
> - CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX),
> - CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX),
> + CLK("davinci_emac", NULL, &emac_ick, CK_AM35XX),
> + CLK("davinci_mdio.0", NULL, &emac_fck, CK_AM35XX),
> CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX),
> CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX),
> CLK("musb-am35x", "ick", &hsotgusb_ick_am35xx, CK_AM35XX),
Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases
2012-02-06 8:27 ` Yegor Yefremov
@ 2012-02-09 19:09 ` Matt Porter
2012-02-09 19:45 ` Paul Walmsley
0 siblings, 1 reply; 7+ messages in thread
From: Matt Porter @ 2012-02-09 19:09 UTC (permalink / raw)
To: Yegor Yefremov
Cc: Tony Lindgren, Ilya Yanok, linux-omap, sasha_d, Paul Walmsley
On Mon, Feb 06, 2012 at 09:27:15AM +0100, Yegor Yefremov wrote:
> Am 21.12.2011 00:27, schrieb Ilya Yanok:
> > Rename EMAC clocks to match driver expectations: both davinci_emac and
> > davinci_mdio drivers call clk_get(dev, NULL) so we have to provide
> > ("davinci_emac", NULL) and ("davinci_mdio.0", NULL) clocks instead of
> > ("davinci_emac", "emac_clk") and ("davinci_emac", "phy_clk") resp.
> >
> > CC: Paul Walmsley <paul@pwsan.com>
> > Signed-off-by: Ilya Yanok <yanok@emcraft.com>
> > ---
> > arch/arm/mach-omap2/clock3xxx_data.c | 4 ++--
> > 1 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
> > index d75e5f6..1a60661 100644
> > --- a/arch/arm/mach-omap2/clock3xxx_data.c
> > +++ b/arch/arm/mach-omap2/clock3xxx_data.c
> > @@ -3465,8 +3465,8 @@ static struct omap_clk omap3xxx_clks[] = {
> > CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX),
> > CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX),
> > CLK(NULL, "pclk_ck", &pclk_ck, CK_AM35XX),
> > - CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX),
> > - CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX),
> > + CLK("davinci_emac", NULL, &emac_ick, CK_AM35XX),
> > + CLK("davinci_mdio.0", NULL, &emac_fck, CK_AM35XX),
> > CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX),
> > CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX),
> > CLK("musb-am35x", "ick", &hsotgusb_ick_am35xx, CK_AM35XX),
>
> Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
Tested-by: Matt Porter <mporter@ti.com>
Also passing my nightly tests on an AM3517 EVM.
-Matt
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases
2012-02-09 19:09 ` Matt Porter
@ 2012-02-09 19:45 ` Paul Walmsley
2012-02-09 20:11 ` Matt Porter
0 siblings, 1 reply; 7+ messages in thread
From: Paul Walmsley @ 2012-02-09 19:45 UTC (permalink / raw)
To: Matt Porter
Cc: Yegor Yefremov, Tony Lindgren, Ilya Yanok, linux-omap, sasha_d
On Thu, 9 Feb 2012, Matt Porter wrote:
> On Mon, Feb 06, 2012 at 09:27:15AM +0100, Yegor Yefremov wrote:
> > Am 21.12.2011 00:27, schrieb Ilya Yanok:
> > > Rename EMAC clocks to match driver expectations: both davinci_emac and
> > > davinci_mdio drivers call clk_get(dev, NULL) so we have to provide
> > > ("davinci_emac", NULL) and ("davinci_mdio.0", NULL) clocks instead of
> > > ("davinci_emac", "emac_clk") and ("davinci_emac", "phy_clk") resp.
> > >
> > > CC: Paul Walmsley <paul@pwsan.com>
> > > Signed-off-by: Ilya Yanok <yanok@emcraft.com>
> > > ---
> > > arch/arm/mach-omap2/clock3xxx_data.c | 4 ++--
> > > 1 files changed, 2 insertions(+), 2 deletions(-)
> > >
> > Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
>
> Tested-by: Matt Porter <mporter@ti.com>
>
> Also passing my nightly tests on an AM3517 EVM.
Thanks Matt, Yegor, Ilya; queued for 3.4.
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases
2012-02-09 19:45 ` Paul Walmsley
@ 2012-02-09 20:11 ` Matt Porter
2012-02-09 20:20 ` Paul Walmsley
0 siblings, 1 reply; 7+ messages in thread
From: Matt Porter @ 2012-02-09 20:11 UTC (permalink / raw)
To: Paul Walmsley
Cc: Yegor Yefremov, Tony Lindgren, Ilya Yanok, linux-omap, sasha_d
On Thu, Feb 09, 2012 at 12:45:57PM -0700, Paul Walmsley wrote:
> On Thu, 9 Feb 2012, Matt Porter wrote:
>
> > On Mon, Feb 06, 2012 at 09:27:15AM +0100, Yegor Yefremov wrote:
> > > Am 21.12.2011 00:27, schrieb Ilya Yanok:
> > > > Rename EMAC clocks to match driver expectations: both davinci_emac and
> > > > davinci_mdio drivers call clk_get(dev, NULL) so we have to provide
> > > > ("davinci_emac", NULL) and ("davinci_mdio.0", NULL) clocks instead of
> > > > ("davinci_emac", "emac_clk") and ("davinci_emac", "phy_clk") resp.
> > > >
> > > > CC: Paul Walmsley <paul@pwsan.com>
> > > > Signed-off-by: Ilya Yanok <yanok@emcraft.com>
> > > > ---
> > > > arch/arm/mach-omap2/clock3xxx_data.c | 4 ++--
> > > > 1 files changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > Tested-by: Yegor Yefremov <yegorslists@googlemail.com>
> >
> > Tested-by: Matt Porter <mporter@ti.com>
> >
> > Also passing my nightly tests on an AM3517 EVM.
>
> Thanks Matt, Yegor, Ilya; queued for 3.4.
Thanks Paul.
Any chance we can see it in 3.3 fixes? It's the only thing preventing
the emac and thus nfsroot from working in 3.3 for these systems.
-Matt
^ permalink raw reply [flat|nested] 7+ messages in thread* Re: [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases
2012-02-09 20:11 ` Matt Porter
@ 2012-02-09 20:20 ` Paul Walmsley
2012-02-09 21:03 ` Matt Porter
0 siblings, 1 reply; 7+ messages in thread
From: Paul Walmsley @ 2012-02-09 20:20 UTC (permalink / raw)
To: Matt Porter
Cc: Yegor Yefremov, Tony Lindgren, Ilya Yanok, linux-omap, sasha_d
Hi Matt
On Thu, 9 Feb 2012, Matt Porter wrote:
> Thanks Paul.
>
> Any chance we can see it in 3.3 fixes? It's the only thing preventing
> the emac and thus nfsroot from working in 3.3 for these systems.
Did EMAC work on previous versions of Linux for those systems? i.e., does
this patch fix a regression?
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases
2012-02-09 20:20 ` Paul Walmsley
@ 2012-02-09 21:03 ` Matt Porter
0 siblings, 0 replies; 7+ messages in thread
From: Matt Porter @ 2012-02-09 21:03 UTC (permalink / raw)
To: Paul Walmsley
Cc: Yegor Yefremov, Tony Lindgren, Ilya Yanok, linux-omap, sasha_d
On Thu, Feb 09, 2012 at 01:20:50PM -0700, Paul Walmsley wrote:
> Hi Matt
>
> On Thu, 9 Feb 2012, Matt Porter wrote:
>
> > Thanks Paul.
> >
> > Any chance we can see it in 3.3 fixes? It's the only thing preventing
> > the emac and thus nfsroot from working in 3.3 for these systems.
>
> Did EMAC work on previous versions of Linux for those systems? i.e., does
> this patch fix a regression?
It's been broken since at least 2.6.37 (predating my time working with
these parts) when the MDIO driver was split out from the EMAC driver. As
it was so long ago, I won't try to classify this as fixing a regression
since most likely something else was broken in that timeframe. :) Thanks
for the clarification.
-Matt
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-02-09 21:04 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-20 23:27 [PATCH] OMAP3: clock3xxx_data: change EMAC clocks aliases Ilya Yanok
2012-02-06 8:27 ` Yegor Yefremov
2012-02-09 19:09 ` Matt Porter
2012-02-09 19:45 ` Paul Walmsley
2012-02-09 20:11 ` Matt Porter
2012-02-09 20:20 ` Paul Walmsley
2012-02-09 21:03 ` Matt Porter
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).