[PATCH] arm64: dts: renesas: r8a77965: Move timer node
To preserve alphabetical sort order. Fixes: 4c529600eef0a6b7 ("arm64: dts: renesas: r8a77965: Add R-Car Gen3 thermal support") Signed-off-by: Geert Uytterhoeven --- arch/arm64/boot/dts/renesas/r8a77965.dtsi | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi b/arch/arm64/boot/dts/renesas/r8a77965.dtsi index 776928518c9b0011..b14a1bad461648ab 100644 --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi @@ -1932,14 +1932,6 @@ }; }; - timer { - compatible = "arm,armv8-timer"; - interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, - <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, - <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, - <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; - }; - thermal-zones { sensor_thermal1: sensor-thermal1 { polling-delay-passive = <250>; @@ -1984,6 +1976,14 @@ }; }; + timer { + compatible = "arm,armv8-timer"; + interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, + <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, + <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>, + <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>; + }; + /* External USB clocks - can be overridden by the board */ usb3s0_clk: usb3s0 { compatible = "fixed-clock"; -- 2.17.1
Re: [PATCH] arm64: dts: renesas: r8a77965: Move timer node
Hi Geert, Thanks for your patch. On 2018-08-28 16:14:44 +0200, Geert Uytterhoeven wrote: > To preserve alphabetical sort order. > > Fixes: 4c529600eef0a6b7 ("arm64: dts: renesas: r8a77965: Add R-Car Gen3 > thermal support") > Signed-off-by: Geert Uytterhoeven Reviewed-by: Niklas Söderlund > --- > arch/arm64/boot/dts/renesas/r8a77965.dtsi | 16 > 1 file changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm64/boot/dts/renesas/r8a77965.dtsi > b/arch/arm64/boot/dts/renesas/r8a77965.dtsi > index 776928518c9b0011..b14a1bad461648ab 100644 > --- a/arch/arm64/boot/dts/renesas/r8a77965.dtsi > +++ b/arch/arm64/boot/dts/renesas/r8a77965.dtsi > @@ -1932,14 +1932,6 @@ > }; > }; > > - timer { > - compatible = "arm,armv8-timer"; > - interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>, > - <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>, > - <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>, > - <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>; > - }; > - > thermal-zones { > sensor_thermal1: sensor-thermal1 { > polling-delay-passive = <250>; > @@ -1984,6 +1976,14 @@ > }; > }; > > + timer { > + compatible = "arm,armv8-timer"; > + interrupts-extended = <&gic GIC_PPI 13 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>, > + <&gic GIC_PPI 14 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>, > + <&gic GIC_PPI 11 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>, > + <&gic GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) > | IRQ_TYPE_LEVEL_LOW)>; > + }; > + > /* External USB clocks - can be overridden by the board */ > usb3s0_clk: usb3s0 { > compatible = "fixed-clock"; > -- > 2.17.1 > -- Regards, Niklas Söderlund
Re: [PATCH] arm64: dts: renesas: r8a77965: Move timer node
On Wed, Aug 29, 2018 at 05:27:58PM +0200, Niklas Söderlund wrote: > Hi Geert, > > Thanks for your patch. > > On 2018-08-28 16:14:44 +0200, Geert Uytterhoeven wrote: > > To preserve alphabetical sort order. > > > > Fixes: 4c529600eef0a6b7 ("arm64: dts: renesas: r8a77965: Add R-Car Gen3 > > thermal support") > > Signed-off-by: Geert Uytterhoeven > > Reviewed-by: Niklas Söderlund Thanks Geert, thanks Niklas, applied for v4.20.