Skip to content

Commit 59269b9

Browse files
Ilya YanokPaul Walmsley
authored andcommitted
ARM: OMAP AM3517/3505: clock data: change EMAC clocks aliases
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 <[email protected]> Signed-off-by: Ilya Yanok <[email protected]> Tested-by: Yegor Yefremov <[email protected]> Tested-by: Matt Porter <[email protected]> Signed-off-by: Paul Walmsley <[email protected]>
1 parent 0eb4fd9 commit 59269b9

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/arm/mach-omap2/clock3xxx_data.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3467,8 +3467,8 @@ static struct omap_clk omap3xxx_clks[] = {
34673467
CLK(NULL, "ipss_ick", &ipss_ick, CK_AM35XX),
34683468
CLK(NULL, "rmii_ck", &rmii_ck, CK_AM35XX),
34693469
CLK(NULL, "pclk_ck", &pclk_ck, CK_AM35XX),
3470-
CLK("davinci_emac", "emac_clk", &emac_ick, CK_AM35XX),
3471-
CLK("davinci_emac", "phy_clk", &emac_fck, CK_AM35XX),
3470+
CLK("davinci_emac", NULL, &emac_ick, CK_AM35XX),
3471+
CLK("davinci_mdio.0", NULL, &emac_fck, CK_AM35XX),
34723472
CLK("vpfe-capture", "master", &vpfe_ick, CK_AM35XX),
34733473
CLK("vpfe-capture", "slave", &vpfe_fck, CK_AM35XX),
34743474
CLK("musb-am35x", "ick", &hsotgusb_ick_am35xx, CK_AM35XX),

0 commit comments

Comments
 (0)