Hi agin,
 
 On mer., avril 25 2018, Gregory CLEMENT <gregory.clem...@bootlin.com> wrote:

> Hi Maxime,
>  
>  On mer., avril 25 2018, Maxime Chevallier <maxime.chevall...@bootlin.com> 
> wrote:
>
>> The Marvell XSMI controller needs 3 clocks to operate correctly :
>>  - The MG clock (clk 5)
>>  - The MG Core clock (clk 6)
>>  - The GOP clock (clk 18)
>>
>>  This commit adds them, to avoid system hangs when using these
>>  interfaces.
>>
>> Fixes: c7e92def1ef4 ("clk: mvebu: cp110: Fix clock tree representation")
>> Signed-off-by: Maxime Chevallier <maxime.chevall...@bootlin.com>
>
> This patch should not have been sent with the net prefix and should not
> be merge through the net subsystem.
>
> I will take care of it to avoid conflict in the devei tree file during
> the merge windows.


So, applied on mvebu/fixes

Thanks,

Gregory


>
> Thanks,
>
> Gregory
>
>> ---
>>  arch/arm64/boot/dts/marvell/armada-cp110.dtsi | 2 ++
>>  1 file changed, 2 insertions(+)
>>
>> diff --git a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi 
>> b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
>> index 6c137ac656e9..ed2f1237ea1e 100644
>> --- a/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
>> +++ b/arch/arm64/boot/dts/marvell/armada-cp110.dtsi
>> @@ -142,6 +142,8 @@
>>                      #size-cells = <0>;
>>                      compatible = "marvell,xmdio";
>>                      reg = <0x12a600 0x10>;
>> +                    clocks = <&CP110_LABEL(clk) 1 5>,
>> +                             <&CP110_LABEL(clk) 1 6>, <&CP110_LABEL(clk) 1 
>> 18>;
>>                      status = "disabled";
>>              };
>>  
>> -- 
>> 2.11.0
>>
>
> -- 
> Gregory Clement, Bootlin (formerly Free Electrons)
> Embedded Linux and Kernel engineering
> http://bootlin.com

-- 
Gregory Clement, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
http://bootlin.com

Reply via email to