3.14-stable review patch.  If anyone has any objections, please let me know.

------------------

From: Florian Vaussard <[email protected]>

commit 8559087f0e9722a95df43fa5968bd1ee42bcf540 upstream.

When arch/arm/mach-omap2/gpmc.c calls clk_get(..., "fck"), it will
get a dummy clock and try to use it. As the rate is configured to zero,
this will result in several divisions by zero, and misconfigured
timings, with devices on the bus being lost in the La La Land.

It is better to remove gpmc_fck from the dummy clocks, so that gpmc.c
can fail gracefully.

Signed-off-by: Florian Vaussard <[email protected]>
Acked-by: Tero Kristo <[email protected]>
Signed-off-by: Tony Lindgren <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

---
 drivers/clk/ti/clk-44xx.c |    1 -
 drivers/clk/ti/clk-54xx.c |    1 -
 drivers/clk/ti/clk-7xx.c  |    1 -
 3 files changed, 3 deletions(-)

--- a/drivers/clk/ti/clk-44xx.c
+++ b/drivers/clk/ti/clk-44xx.c
@@ -222,7 +222,6 @@ static struct ti_dt_clk omap44xx_clks[]
        DT_CLK(NULL, "auxclk5_src_ck", "auxclk5_src_ck"),
        DT_CLK(NULL, "auxclk5_ck", "auxclk5_ck"),
        DT_CLK(NULL, "auxclkreq5_ck", "auxclkreq5_ck"),
-       DT_CLK("50000000.gpmc", "fck", "dummy_ck"),
        DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
        DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
        DT_CLK("omap_i2c.3", "ick", "dummy_ck"),
--- a/drivers/clk/ti/clk-54xx.c
+++ b/drivers/clk/ti/clk-54xx.c
@@ -182,7 +182,6 @@ static struct ti_dt_clk omap54xx_clks[]
        DT_CLK(NULL, "auxclk3_src_ck", "auxclk3_src_ck"),
        DT_CLK(NULL, "auxclk3_ck", "auxclk3_ck"),
        DT_CLK(NULL, "auxclkreq3_ck", "auxclkreq3_ck"),
-       DT_CLK(NULL, "gpmc_ck", "dummy_ck"),
        DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
        DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
        DT_CLK("omap_i2c.3", "ick", "dummy_ck"),
--- a/drivers/clk/ti/clk-7xx.c
+++ b/drivers/clk/ti/clk-7xx.c
@@ -262,7 +262,6 @@ static struct ti_dt_clk dra7xx_clks[] =
        DT_CLK(NULL, "vip1_gclk_mux", "vip1_gclk_mux"),
        DT_CLK(NULL, "vip2_gclk_mux", "vip2_gclk_mux"),
        DT_CLK(NULL, "vip3_gclk_mux", "vip3_gclk_mux"),
-       DT_CLK(NULL, "gpmc_ck", "dummy_ck"),
        DT_CLK("omap_i2c.1", "ick", "dummy_ck"),
        DT_CLK("omap_i2c.2", "ick", "dummy_ck"),
        DT_CLK("omap_i2c.3", "ick", "dummy_ck"),


--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to [email protected]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to