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

Commit ef37427a authored by Bartosz Golaszewski's avatar Bartosz Golaszewski Committed by Sekhar Nori
Browse files

ARM: davinci: da850: don't add emac clock to lookup table twice 



Similarly to the aemif clock - this screws up the linked list of clock
children. Create a separate clock for mdio inheriting the rate from
emac_clk.

Cc: <stable@vger.kernel.org> # 3.12.x-
Signed-off-by: default avatarBartosz Golaszewski <bgolaszewski@baylibre.com>
[nsekhar@ti.com: add a comment over mdio_clk to explaing its existence +
		 commit headline updates]
Signed-off-by: default avatarSekhar Nori <nsekhar@ti.com>
parent 5d45b011

arch/arm/mach-davinci/da850.c

+11 −1
Original line number Diff line number Diff line
@@ -319,6 +319,16 @@ static struct clk emac_clk = { 
	.gpsc		= 1,

};



/*

 * In order to avoid adding the emac_clk to the clock lookup table twice (and

 * screwing up the linked list in the process) create a separate clock for

 * mdio inheriting the rate from emac_clk.

 */

static struct clk mdio_clk = {

	.name		= "mdio",

	.parent		= &emac_clk,

};



static struct clk mcasp_clk = {

	.name		= "mcasp",

	.parent		= &async3_clk,
@@ -539,7 +549,7 @@ static struct clk_lookup da850_clks[] = { 
	CLK(NULL,		"arm",		&arm_clk),

	CLK(NULL,		"rmii",		&rmii_clk),

	CLK("davinci_emac.1",	NULL,		&emac_clk),

	CLK("davinci_mdio.0",	"fck",		&emac_clk),

	CLK("davinci_mdio.0",	"fck",		&mdio_clk),

	CLK("davinci-mcasp.0",	NULL,		&mcasp_clk),

	CLK("davinci-mcbsp.0",	NULL,		&mcbsp0_clk),

	CLK("davinci-mcbsp.1",	NULL,		&mcbsp1_clk),