Subject: [PATCH] clk/zynq/clkc: Add CLK_SET_RATE_PARENT flag to ethernet muxes

From: [email-masked] (Michal Simek)
Date: Wed, 26 Jun 2013 11:57:47 +0200

On 06/24/2013 05:58 PM, S?ren Brinkmann wrote:
> ping?
> 
> On Mon, Jun 17, 2013 at 03:47:40PM -0700, Soren Brinkmann wrote:
>> Zynq's Ethernet clocks are created by the following hierarchy:
>> 	mux0 ---> div0 ---> div1 ---> mux1 ---> gate
>> Rate change requests on the gate have to propagate all the way up to
>> div0 to properly leverage all dividers. Mux1 was missing the
>> CLK_SET_RATE_PARENT flag, which is required to achieve this.
>>
>> Signed-off-by: Soren Brinkmann <[email-masked]>
>> ---
>>  drivers/clk/zynq/clkc.c | 10 ++++++----
>>  1 file changed, 6 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/clk/zynq/clkc.c b/drivers/clk/zynq/clkc.c
>> index 515a573..089d3e3 100644
>> --- a/drivers/clk/zynq/clkc.c
>> +++ b/drivers/clk/zynq/clkc.c
>> @@ -365,8 +365,9 @@ static void __init zynq_clk_setup(struct device_node *np)
>>  			CLK_SET_RATE_PARENT, SLCR_GEM0_CLK_CTRL, 20, 6,
>>  			CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,
>>  			&gem0clk_lock);
>> -	clk = clk_register_mux(NULL, "gem0_emio_mux", gem0_mux_parents, 2, 0,
>> -			SLCR_GEM0_CLK_CTRL, 6, 1, 0, &gem0clk_lock);
>> +	clk = clk_register_mux(NULL, "gem0_emio_mux", gem0_mux_parents, 2,
>> +			CLK_SET_RATE_PARENT, SLCR_GEM0_CLK_CTRL, 6, 1, 0,
>> +			&gem0clk_lock);
>>  	clks[gem0] = clk_register_gate(NULL, clk_output_name[gem0],
>>  			"gem0_emio_mux", CLK_SET_RATE_PARENT,
>>  			SLCR_GEM0_CLK_CTRL, 0, 0, &gem0clk_lock);
>> @@ -387,8 +388,9 @@ static void __init zynq_clk_setup(struct device_node *np)
>>  			CLK_SET_RATE_PARENT, SLCR_GEM1_CLK_CTRL, 20, 6,
>>  			CLK_DIVIDER_ONE_BASED | CLK_DIVIDER_ALLOW_ZERO,
>>  			&gem1clk_lock);
>> -	clk = clk_register_mux(NULL, "gem1_emio_mux", gem1_mux_parents, 2, 0,
>> -			SLCR_GEM1_CLK_CTRL, 6, 1, 0, &gem1clk_lock);
>> +	clk = clk_register_mux(NULL, "gem1_emio_mux", gem1_mux_parents, 2,
>> +			CLK_SET_RATE_PARENT, SLCR_GEM1_CLK_CTRL, 6, 1, 0,
>> +			&gem1clk_lock);
>>  	clks[gem1] = clk_register_gate(NULL, clk_output_name[gem1],
>>  			"gem1_emio_mux", CLK_SET_RATE_PARENT,
>>  			SLCR_GEM1_CLK_CTRL, 0, 0, &gem1clk_lock);
>> -- 
>> 1.8.3.1
>>

Applied.

Thanks,
Michal

-- 
Michal Simek, Ing. (M.Eng), OpenPGP -> KeyID: FE3D1F91
w: 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

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 263 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20130626/6ec62ae7/attachment-0001.sig>