From: Sriram Date: Mon, 10 May 2010 21:29:17 +0000 (-0700) Subject: OMAP3: clock data: Update name string for EMAC clocks X-Git-Tag: v2.6.35-rc1~456^2~27^2~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b98dd73c6cd13ff9a5576a845ca9c1e359fdb7d0;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git 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 Acked-by: Paul Walmsley [tony@atomide.com: updated patch description to match the patch] Signed-off-by: Tony Lindgren --- 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),