| Message ID | 1480612516-18853-2-git-send-email-bgolaszewski@baylibre.com |
|---|---|
| State | New |
| Headers | show |
Hi Bartosz, On Thursday 01 December 2016 10:45 PM, Bartosz Golaszewski wrote: > The aemif clock is added twice to the lookup table in da850.c. This > breaks the children list of pll0_sysclk3 as we're using the same list > links in struct clk. When calling clk_set_rate(), we get stuck in > propagate_rate(). > > Simply add the clock once, but specify both the con_id and dev_id in > the lookup entry. > > Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> The issue is real, but the fix is not going to be this simple, I am afraid. This will break NAND on all da850 boards including LCDK. The aemif clock is accessed in two ways. One by the drivers/memory/ti-aemif.c, using ti-aemif as the device name and NULL connection id. Second by drivers/mtd/nand/davinci_nand.c and arch/arm/mach-davinci/aemif.c using davinci-nand as device id and with "aemif" as the connection id. We will need to match both. The only way to fix this without breaking anything is to create two clocks for the two lookups above. Both cannot be PSC clocks for the same PSC module as that would be racy. Instead just create a new nand clock node which is a child of the aemif node and inherits parent's clock rate. Thanks, Sekhar
diff --git a/arch/arm/mach-davinci/da850.c b/arch/arm/mach-davinci/da850.c index e770c97..1e11ce8 100644 --- a/arch/arm/mach-davinci/da850.c +++ b/arch/arm/mach-davinci/da850.c @@ -536,8 +536,7 @@ static struct clk_lookup da850_clks[] = { CLK("da8xx_lcdc.0", "fck", &lcdc_clk), CLK("da830-mmc.0", NULL, &mmcsd0_clk), CLK("da830-mmc.1", NULL, &mmcsd1_clk), - CLK("ti-aemif", NULL, &aemif_clk), - CLK(NULL, "aemif", &aemif_clk), + CLK("ti-aemif", "aemif", &aemif_clk), CLK("ohci-da8xx", "usb11", &usb11_clk), CLK("musb-da8xx", "usb20", &usb20_clk), CLK("spi_davinci.0", NULL, &spi0_clk),
The aemif clock is added twice to the lookup table in da850.c. This breaks the children list of pll0_sysclk3 as we're using the same list links in struct clk. When calling clk_set_rate(), we get stuck in propagate_rate(). Simply add the clock once, but specify both the con_id and dev_id in the lookup entry. Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com> --- arch/arm/mach-davinci/da850.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- 2.9.3