diff options
author | Florian Vaussard <florian.vaussard@epfl.ch> | 2014-02-26 05:38:08 -0500 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-03-13 16:41:50 -0400 |
commit | 8559087f0e9722a95df43fa5968bd1ee42bcf540 (patch) | |
tree | 82de2aad81e677df258600e79411a7cc064a3195 /drivers/clk | |
parent | 07484ca33ef83900f5cfbde075c1a19e5a237aa1 (diff) |
CLK: TI: OMAP4/5/DRA7: Remove gpmc_fck from dummy clocks
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.
Cc: stable@vger.kernel.org # v3.14+
Signed-off-by: Florian Vaussard <florian.vaussard@epfl.ch>
Acked-by: Tero Kristo <t-kristo@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers/clk')
-rw-r--r-- | drivers/clk/ti/clk-44xx.c | 1 | ||||
-rw-r--r-- | drivers/clk/ti/clk-54xx.c | 1 | ||||
-rw-r--r-- | drivers/clk/ti/clk-7xx.c | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/drivers/clk/ti/clk-44xx.c b/drivers/clk/ti/clk-44xx.c index ae00218b5da3..02517a8206bd 100644 --- 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[] = { | |||
222 | DT_CLK(NULL, "auxclk5_src_ck", "auxclk5_src_ck"), | 222 | DT_CLK(NULL, "auxclk5_src_ck", "auxclk5_src_ck"), |
223 | DT_CLK(NULL, "auxclk5_ck", "auxclk5_ck"), | 223 | DT_CLK(NULL, "auxclk5_ck", "auxclk5_ck"), |
224 | DT_CLK(NULL, "auxclkreq5_ck", "auxclkreq5_ck"), | 224 | DT_CLK(NULL, "auxclkreq5_ck", "auxclkreq5_ck"), |
225 | DT_CLK("50000000.gpmc", "fck", "dummy_ck"), | ||
226 | DT_CLK("omap_i2c.1", "ick", "dummy_ck"), | 225 | DT_CLK("omap_i2c.1", "ick", "dummy_ck"), |
227 | DT_CLK("omap_i2c.2", "ick", "dummy_ck"), | 226 | DT_CLK("omap_i2c.2", "ick", "dummy_ck"), |
228 | DT_CLK("omap_i2c.3", "ick", "dummy_ck"), | 227 | DT_CLK("omap_i2c.3", "ick", "dummy_ck"), |
diff --git a/drivers/clk/ti/clk-54xx.c b/drivers/clk/ti/clk-54xx.c index 0ef9f581286b..08f3d1b915b3 100644 --- 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[] = { | |||
182 | DT_CLK(NULL, "auxclk3_src_ck", "auxclk3_src_ck"), | 182 | DT_CLK(NULL, "auxclk3_src_ck", "auxclk3_src_ck"), |
183 | DT_CLK(NULL, "auxclk3_ck", "auxclk3_ck"), | 183 | DT_CLK(NULL, "auxclk3_ck", "auxclk3_ck"), |
184 | DT_CLK(NULL, "auxclkreq3_ck", "auxclkreq3_ck"), | 184 | DT_CLK(NULL, "auxclkreq3_ck", "auxclkreq3_ck"), |
185 | DT_CLK(NULL, "gpmc_ck", "dummy_ck"), | ||
186 | DT_CLK("omap_i2c.1", "ick", "dummy_ck"), | 185 | DT_CLK("omap_i2c.1", "ick", "dummy_ck"), |
187 | DT_CLK("omap_i2c.2", "ick", "dummy_ck"), | 186 | DT_CLK("omap_i2c.2", "ick", "dummy_ck"), |
188 | DT_CLK("omap_i2c.3", "ick", "dummy_ck"), | 187 | DT_CLK("omap_i2c.3", "ick", "dummy_ck"), |
diff --git a/drivers/clk/ti/clk-7xx.c b/drivers/clk/ti/clk-7xx.c index 9977653f2d63..f7e40734c819 100644 --- 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[] = { | |||
262 | DT_CLK(NULL, "vip1_gclk_mux", "vip1_gclk_mux"), | 262 | DT_CLK(NULL, "vip1_gclk_mux", "vip1_gclk_mux"), |
263 | DT_CLK(NULL, "vip2_gclk_mux", "vip2_gclk_mux"), | 263 | DT_CLK(NULL, "vip2_gclk_mux", "vip2_gclk_mux"), |
264 | DT_CLK(NULL, "vip3_gclk_mux", "vip3_gclk_mux"), | 264 | DT_CLK(NULL, "vip3_gclk_mux", "vip3_gclk_mux"), |
265 | DT_CLK(NULL, "gpmc_ck", "dummy_ck"), | ||
266 | DT_CLK("omap_i2c.1", "ick", "dummy_ck"), | 265 | DT_CLK("omap_i2c.1", "ick", "dummy_ck"), |
267 | DT_CLK("omap_i2c.2", "ick", "dummy_ck"), | 266 | DT_CLK("omap_i2c.2", "ick", "dummy_ck"), |
268 | DT_CLK("omap_i2c.3", "ick", "dummy_ck"), | 267 | DT_CLK("omap_i2c.3", "ick", "dummy_ck"), |