| From 8f1f273065be3102c89727c356355ebbe6d9c022 Mon Sep 17 00:00:00 2001 |
| From: Soren Brinkmann <soren.brinkmann@xilinx.com> |
| Date: Mon, 17 Jun 2013 15:03:46 -0700 |
| Subject: clk/zynq/clkc: Add dedicated spinlock for the SWDT |
| |
| The clk_mux for the system watchdog timer reused the register lock |
| dedicated to the Ethernet module - for no apparent reason. |
| Add a lock dedicated to the SWDT's clock register to remove this |
| wrong dependency. |
| |
| This does not fix a specific regression but the clock driver was merged |
| for 3.11-rc1, so best to fix the known bugs before the release. |
| |
| Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com> |
| Signed-off-by: Michal Simek <michal.simek@xilinx.com> |
| Signed-off-by: Mike Turquette <mturquette@linaro.org> |
| [mturquette@linaro.org: added to changelog] |
| |
| (cherry picked from commit 252957cc3a2d59179df1a2d44d219e07dc5c3f06) |
| Signed-off-by: Daniel Sangorrin <daniel.sangorrin@toshiba.co.jp> |
| Signed-off-by: Yoshitake Kobayashi <yoshitake.kobayashi@toshiba.co.jp> |
| --- |
| drivers/clk/zynq/clkc.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c |
| index 5c205b60a82a..515a5732d391 100644 |
| --- a/drivers/clk/zynq/clkc.c |
| +++ b/drivers/clk/zynq/clkc.c |
| @@ -71,6 +71,7 @@ static DEFINE_SPINLOCK(armpll_lock); |
| static DEFINE_SPINLOCK(ddrpll_lock); |
| static DEFINE_SPINLOCK(iopll_lock); |
| static DEFINE_SPINLOCK(armclk_lock); |
| +static DEFINE_SPINLOCK(swdtclk_lock); |
| static DEFINE_SPINLOCK(ddrclk_lock); |
| static DEFINE_SPINLOCK(dciclk_lock); |
| static DEFINE_SPINLOCK(gem0clk_lock); |
| @@ -293,7 +294,7 @@ static void __init zynq_clk_setup(struct device_node *np) |
| } |
| clks[swdt] = clk_register_mux(NULL, clk_output_name[swdt], |
| swdt_ext_clk_mux_parents, 2, CLK_SET_RATE_PARENT, |
| - SLCR_SWDT_CLK_SEL, 0, 1, 0, &gem0clk_lock); |
| + SLCR_SWDT_CLK_SEL, 0, 1, 0, &swdtclk_lock); |
| |
| /* DDR clocks */ |
| clk = clk_register_divider(NULL, "ddr2x_div", "ddrpll", 0, |
| -- |
| 1.8.5.rc3 |
| |
