diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2013-04-12 16:29:07 +0200 |
|---|---|---|
| committer | Jason Cooper <jason@lakedaemon.net> | 2013-04-15 17:00:17 +0200 |
| commit | b18ea4dc7746f1270bbe3a0817f9a034eec031a8 (patch) | |
| tree | d7043bd99e911ad6bfd84eebabe5a85d27f09fe7 /arch/arm/boot/dts/armada-370.dtsi | |
| parent | ARM: dts: mvebu: fix cpus section indentation (diff) | |
| download | linux-b18ea4dc7746f1270bbe3a0817f9a034eec031a8.tar.xz linux-b18ea4dc7746f1270bbe3a0817f9a034eec031a8.zip | |
ARM: dts: mvebu: move all peripherals inside soc
reorganize the .dts and .dtsi files so that all devices are under the
soc { } node (currently some devices such as the interrupt controller,
the L2 cache and a few others are outside).
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
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 | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/armada-370.dtsi b/arch/arm/boot/dts/armada-370.dtsi index 18f6eb47cc50..209caeb748fa 100644 --- a/arch/arm/boot/dts/armada-370.dtsi +++ b/arch/arm/boot/dts/armada-370.dtsi @@ -20,12 +20,6 @@ / { model = "Marvell Armada 370 family SoC"; compatible = "marvell,armada370", "marvell,armada-370-xp"; - L2: l2-cache { - compatible = "marvell,aurora-outer-cache"; - reg = <0xd0008000 0x1000>; - cache-id-part = <0x100>; - wt-override; - }; aliases { gpio0 = &gpio0; @@ -33,17 +27,24 @@ gpio2 = &gpio2; }; - mpic: interrupt-controller@d0020000 { - reg = <0xd0020a00 0x1d0>, - <0xd0021870 0x58>; - }; - soc { + mpic: interrupt-controller@d0020000 { + reg = <0xd0020a00 0x1d0>, + <0xd0021870 0x58>; + }; + system-controller@d0018200 { compatible = "marvell,armada-370-xp-system-controller"; reg = <0xd0018200 0x100>; }; + L2: l2-cache { + compatible = "marvell,aurora-outer-cache"; + reg = <0xd0008000 0x1000>; + cache-id-part = <0x100>; + wt-override; + }; + pinctrl { compatible = "marvell,mv88f6710-pinctrl"; reg = <0xd0018000 0x38>; |