2013-06-17 22:04:04

by Soren Brinkmann

[permalink] [raw]

Subject: [PATCH] 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.

Signed-off-by: Soren Brinkmann <[email protected]>
---
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

2013-06-24 15:58:21

by Soren Brinkmann

[permalink] [raw]

Subject: Re: [PATCH] clk/zynq/clkc: Add dedicated spinlock for the SWDT

---

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 <[email protected]>
> ---
> 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
>
>

2013-06-26 09:58:01

by Michal Simek

[permalink] [raw]

Subject: Re: [PATCH] clk/zynq/clkc: Add dedicated spinlock for the SWDT

---

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 <[email protected]>
>> ---
>> 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


--
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: http://www.monstr.eu p: +42-0-721842854
Maintainer of Linux kernel - Microblaze cpu - http://www.monstr.eu/fdt/
Maintainer of Linux kernel - Xilinx Zynq ARM architecture
Microblaze U-BOOT custodian and responsible for u-boot arm zynq platform

---

Attachments:

signature.asc (263.00 B)
OpenPGP digital signature