Patch "ARM: davinci: da850: don't add emac clock to lookup table twice" has been added to the 4.4-stable tree
This is a note to let you know that I've just added the patch titled
ARM: davinci: da850: don't add emac clock to lookup table twice
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
arm-davinci-da850-don-t-add-emac-clock-to-lookup-table-twice.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
ef37427ac5677331145ab27a17e6f5f1b43f0c11Mon Sep 17 00:00:00 2001
From: Bartosz Golaszewski <[email protected]>
Date: Wed, 7 Dec 2016 16:22:16 +0100
Subject: ARM: davinci: da850: don't add emac clock to lookup table twice
From: Bartosz Golaszewski <[email protected]>
commit ef37427ac5677331145ab27a17e6f5f1b43f0c11 upstream.
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.
[[email protected]: add a comment over mdio_clk to explaing its existence +
commit headline updates]
--- arch/arm/mach-davinci/da850.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
arch/arm/mach-davinci/da850.c +11 -1
@@ -298,6 +298,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 = &pll0_sysclk2,
@@ -462,7 +472,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 ("da8xx_lcdc.0" ,"fck" , &lcdc_clk), CLK("da830-mmc.0", NULL, &mmcsd0_clk),
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/arm-davinci-da850-don-t-add-emac-clock-to-lookup-table-twice.patch