Commit 3dccfecd authored Jan 27, 2015 by Soren Brinkmann Committed by Michael Turquette Jan 27, 2015

clk: zynq: Force CPU_2X clock to be ungated



The CPU_2X clock does not have a classical in-kernel user, but is,
amongst other things, required for OCM and debug access. Make sure this
clock is not mistakenly disabled during boot up by enabling it in the
platform's clock driver.

Cc: stable@vger.kernel.org # 3.11+
Fixes: 0ee52b15 'clk: zynq: Add clock controller driver'
Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: Michael Turquette <mturquette@linaro.org>

parent 8f101aa0

drivers/clk/zynq/clkc.c

+1 −0

Original line number	Diff line number	Diff line
		@@ -303,6 +303,7 @@ static void __init zynq_clk_setup(struct device_node *np)
		clks[cpu_2x] = clk_register_gate(NULL, clk_output_name[cpu_2x],
		"cpu_2x_div", CLK_IGNORE_UNUSED, SLCR_ARM_CLK_CTRL,
		26, 0, &armclk_lock);
		clk_prepare_enable(clks[cpu_2x]);

		clk = clk_register_fixed_factor(NULL, "cpu_1x_div", "cpu_div", 0, 1,
		4 + 2 * tmp);

Admin message