* Tony Lindgren <tony@xxxxxxxxxxx> [100505 12:59]:
> * Russell King - ARM Linux <linux@xxxxxxxxxxxxxxxx> [100505 12:41]:
> > On Wed, May 05, 2010 at 12:33:09PM -0700, Tony Lindgren wrote:
> > > The emac driver uses generic name for the module and phy
> > > clocks. Updated the omap3xxx_clks table to match the names
> > > used by the Davinci emac driver.
> >
> > Patch doesn't match description.
>
> Sriramakrishnan, can you please update the patch for better
> description?
Never mind, running out of time waiting. Updated patch below.
> > IMHO "ick" and "fck" are generic names, whereas "emac_clk" and
> > "phy_clk" are specific names.
> >
> > > - CLK("davinci_emac", "ick", &emac_ick, CK_AM35XX),
> > > - CLK("davinci_emac", "fck", &emac_fck, CK_AM35XX),
> > > + CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX),
> > > + CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX),
>
> Yeah as Paul pointed out too, there should be a follow-up patch
> to fix there clock names in drivers/net/davinci_emac.c, mach-davinci/dm646x.c,
> mach-davinci/da850.c, and mach-omap2/clock3xxx_data.c.
>
> That should also be mentioned in the patch description.
Added a note for that too.
Tony
>From eba164add86ebeb389f636ffca8ab691956cfe01 Mon Sep 17 00:00:00 2001
From: Sriram <srk@xxxxxx>
Date: Thu, 11 Mar 2010 15:13:41 +0000
Subject: [PATCH] OMAP3 : clock data: Update name string for EMAC clocks
The emac driver currently uses Davinci clock names for the module and phy
clocks. Updated the omap3xxx_clks table to match the names
used by the Davinci emac driver.
Note that eventually the EMAC clocks should be renamed to be generic.
Signed-off-by: Sriramakrishnan <srk@xxxxxx>
Acked-by: Paul Walmsley <paul@xxxxxxxxx>
[tony@xxxxxxxxxxx: updated patch description to match the patch]
Signed-off-by: Tony Lindgren <tony@xxxxxxxxxxx>
diff --git a/arch/arm/mach-omap2/clock3xxx_data.c b/arch/arm/mach-omap2/clock3xxx_data.c
index 9cba556..6905eb7 100644
--- a/arch/arm/mach-omap2/clock3xxx_data.c
+++ b/arch/arm/mach-omap2/clock3xxx_data.c
@@ -3472,8 +3472,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", "ick", &emac_ick, CK_AM35XX),
- CLK("davinci_emac", "fck", &emac_fck, CK_AM35XX),
+ CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX),
+ CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX),
CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX),
CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX),
CLK("musb_hdrc", "ick", &hsotgusb_ick_am35xx, CK_AM35XX),
