Patchwork clk/zynq/clkc: Add dedicated spinlock for the SWDT

login
register
mail settings
Submitter Soren Brinkmann
Date June 17, 2013, 10:03 p.m.
Message ID <1371506626-3892-1-git-send-email-soren.brinkmann@xilinx.com>
Download mbox | patch
Permalink /patch/252066/
State New
Headers show

Comments

Soren Brinkmann - June 17, 2013, 10:03 p.m.
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.

Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
---
I don't know how this slipped in...
Anyway, the fix depends on armsoc/zynq/clk.

	Sören

 drivers/clk/zynq/clkc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
Soren Brinkmann - June 24, 2013, 3:58 p.m.
ping?

On Mon, Jun 17, 2013 at 03:03:46PM -0700, Soren Brinkmann wrote:
> 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.
> 
> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
> ---
> I don't know how this slipped in...
> Anyway, the fix depends on armsoc/zynq/clk.
> 
> 	Sören
> 
>  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 5c205b6..515a573 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.3.1
> 
>
Michal Simek - June 26, 2013, 9:57 a.m.
On 06/24/2013 05:58 PM, Sören Brinkmann wrote:
> ping?
> 
> On Mon, Jun 17, 2013 at 03:03:46PM -0700, Soren Brinkmann wrote:
>> 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.
>>
>> Signed-off-by: Soren Brinkmann <soren.brinkmann@xilinx.com>
>> ---
>> I don't know how this slipped in...
>> Anyway, the fix depends on armsoc/zynq/clk.
>>
>> 	Sören
>>
>>  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 5c205b6..515a573 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.3.1

Applied.

Thanks,
Michal

Patch

diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
index 5c205b6..515a573 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,