Skip to content

Commit 252957c

Browse files
sorenb-xlnxMike Turquette
authored andcommitted
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 <[email protected]> Signed-off-by: Michal Simek <[email protected]> Signed-off-by: Mike Turquette <[email protected]> [[email protected]: added to changelog]
1 parent d4e4ab8 commit 252957c

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/clk/zynq/clkc.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ static DEFINE_SPINLOCK(armpll_lock);
7171
static DEFINE_SPINLOCK(ddrpll_lock);
7272
static DEFINE_SPINLOCK(iopll_lock);
7373
static DEFINE_SPINLOCK(armclk_lock);
74+
static DEFINE_SPINLOCK(swdtclk_lock);
7475
static DEFINE_SPINLOCK(ddrclk_lock);
7576
static DEFINE_SPINLOCK(dciclk_lock);
7677
static DEFINE_SPINLOCK(gem0clk_lock);
@@ -293,7 +294,7 @@ static void __init zynq_clk_setup(struct device_node *np)
293294
}
294295
clks[swdt] = clk_register_mux(NULL, clk_output_name[swdt],
295296
swdt_ext_clk_mux_parents, 2, CLK_SET_RATE_PARENT,
296-
SLCR_SWDT_CLK_SEL, 0, 1, 0, &gem0clk_lock);
297+
SLCR_SWDT_CLK_SEL, 0, 1, 0, &swdtclk_lock);
297298

298299
/* DDR clocks */
299300
clk = clk_register_divider(NULL, "ddr2x_div", "ddrpll", 0,

0 commit comments

Comments
 (0)