diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2014-11-14 21:43:33 +0100 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2014-11-22 03:36:51 +0000 |
| commit | ab1e85372168892387dd1ac171158fc8c3119be4 (patch) | |
| tree | be1ecd3c7fa7ad261072c9bf704fca978405cdaf /arch/arm/boot/dts/armada-370.dtsi | |
| parent | ad6a1b445bdc19199933051840a53fdd30b8f961 (diff) | |
| download | talos-obmc-linux-ab1e85372168892387dd1ac171158fc8c3119be4.tar.gz talos-obmc-linux-ab1e85372168892387dd1ac171158fc8c3119be4.zip | |
ARM: mvebu: fix ordering in Armada 370 .dtsi
Commit a095b1c78a35 ("ARM: mvebu: sort DT nodes by address")
missed placing the system-controller in the correct order.
Fixes: a095b1c78a35 ("ARM: mvebu: sort DT nodes by address")
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Acked-by: Andrew Lunn <andrew@lunn.ch>
Link: https://lkml.kernel.org/r/20141114204333.GS27002@pengutronix.de
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Diffstat (limited to 'arch/arm/boot/dts/armada-370.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/armada-370.dtsi | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 86d33dbe52c6..509928621ea7 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -107,11 +107,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>; @@ -206,6 +201,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>; |
