releases/3.19.2/clk-zynq-force-cpu_2x-clock-to-be-ungated.patch

   1 From 3dccfecdb867fe35b305a4e493ef5652b7d9d4cb Mon Sep 17 00:00:00 2001
   2 From: Soren Brinkmann <soren.brinkmann@xilinx.com>
   3 Date: Tue, 27 Jan 2015 11:05:27 -0800
   4 Subject: clk: zynq: Force CPU_2X clock to be ungated
   5
   6 From: Soren Brinkmann <soren.brinkmann@xilinx.com>
   7
   8 commit 3dccfecdb867fe35b305a4e493ef5652b7d9d4cb upstream.
   9
  10 The CPU_2X clock does not have a classical in-kernel user, but is,
  11 amongst other things, required for OCM and debug access. Make sure this
  12 clock is not mistakenly disabled during boot up by enabling it in the
  13 platform's clock driver.
  14
  15 Fixes: 0ee52b157b8e 'clk: zynq: Add clock controller driver'
  16 Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
  17 Signed-off-by: Michael Turquette <mturquette@linaro.org>
  18 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  19
  20 ---
  21  drivers/clk/zynq/clkc.c |    1 +
  22  1 file changed, 1 insertion(+)
  23
  24 --- a/drivers/clk/zynq/clkc.c
  25 +++ b/drivers/clk/zynq/clkc.c
  26 @@ -303,6 +303,7 @@ static void __init zynq_clk_setup(struct
  27         clks[cpu_2x] = clk_register_gate(NULL, clk_output_name[cpu_2x],
  28                         "cpu_2x_div", CLK_IGNORE_UNUSED, SLCR_ARM_CLK_CTRL,
  29                         26, 0, &armclk_lock);
  30 +       clk_prepare_enable(clks[cpu_2x]);
  31
  32         clk = clk_register_fixed_factor(NULL, "cpu_1x_div", "cpu_div", 0, 1,
  33                         4 + 2 * tmp);