Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59269b94 authored by Ilya Yanok's avatar Ilya Yanok Committed by Paul Walmsley
Browse files

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 <paul@pwsan.com>
Signed-off-by: default avatarIlya Yanok <yanok@emcraft.com>
Tested-by: default avatarYegor Yefremov <yegorslists@googlemail.com>
Tested-by: default avatarMatt Porter <mporter@ti.com>
Signed-off-by: default avatarPaul Walmsley <paul@pwsan.com>
parent 0eb4fd9b

arch/arm/mach-omap2/clock3xxx_data.c

+2 −2
Original line number Diff line number Diff line
@@ -3467,8 +3467,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),