Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f8c0add authored by Uwe Kleine-König's avatar Uwe Kleine-König Committed by Greg Kroah-Hartman
Browse files

ARM: mvebu: fix ordering in Armada 370 .dtsi 



commit ab1e85372168892387dd1ac171158fc8c3119be4 upstream.

Commit a095b1c7 ("ARM: mvebu: sort DT nodes by address")
missed placing the system-controller in the correct order.

Fixes: a095b1c7 ("ARM: mvebu: sort DT nodes by address")
Signed-off-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: default avatarAndrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/20141114204333.GS27002@pengutronix.de


Signed-off-by: default avatarJason Cooper <jason@lakedaemon.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6e9c89c4

arch/arm/boot/dts/armada-370.dtsi

+5 −5
Original line number Diff line number Diff line
@@ -106,11 +106,6 @@ 
				reg = <0x11100 0x20>;

			};



			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0x18200 0x100>;

			};



			pinctrl {

				compatible = "marvell,mv88f6710-pinctrl";

				reg = <0x18000 0x38>;
@@ -205,6 +200,11 @@ 
				interrupts = <91>;

			};



			system-controller@18200 {

				compatible = "marvell,armada-370-xp-system-controller";

				reg = <0x18200 0x100>;

			};



			gateclk: clock-gating-control@18220 {

				compatible = "marvell,armada-370-gating-clock";

				reg = <0x18220 0x4>;