| From: Bartosz Golaszewski <bgolaszewski@baylibre.com> |
| Date: Wed, 7 Dec 2016 16:22:16 +0100 |
| Subject: ARM: davinci: da850: don't add emac clock to lookup table twice |
| |
| 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. |
| |
| Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> |
| [nsekhar@ti.com: add a comment over mdio_clk to explaing its existence + |
| commit headline updates] |
| Signed-off-by: Sekhar Nori <nsekhar@ti.com> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/arm/mach-davinci/da850.c | 12 +++++++++++- |
| 1 file changed, 11 insertions(+), 1 deletion(-) |
| |
| --- a/arch/arm/mach-davinci/da850.c |
| +++ b/arch/arm/mach-davinci/da850.c |
| @@ -297,6 +297,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, |
| @@ -461,7 +471,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), |