Merge v3.12-rc1 into kbuild/for-next

[karo-tx-linux.git] / arch / arm / boot / dts / armada-370-xp.dtsi

diff --git a/arch/arm/boot/dts/armada-370-xp.dtsi b/arch/arm/boot/dts/armada-370-xp.dtsi
index 90b117624abb2230105855b70fbdf313fa73a05e..1de2dae0fdae6f6353169dc423d75e07d4f65f6f 100644 (file)
--- a/arch/arm/boot/dts/armada-370-xp.dtsi
+++ b/arch/arm/boot/dts/armada-370-xp.dtsi
@@ -18,6 +18,8 @@
 
 /include/ "skeleton64.dtsi"
 
+#define MBUS_ID(target,attributes) (((target) << 24) | ((attributes) << 16))
+
 / {
        model = "Marvell Armada 370 and XP SoC";
        compatible = "marvell,armada-370-xp";
@@ -38,18 +40,73 @@
        };
 
        soc {
-               #address-cells = <1>;
+               #address-cells = <2>;
                #size-cells = <1>;
-               compatible = "simple-bus";
+               controller = <&mbusc>;
                interrupt-parent = <&mpic>;
-               ranges = <0          0 0xd0000000 0x0100000 /* internal registers */
-                         0xe0000000 0 0xe0000000 0x8100000 /* PCIe */>;
+               pcie-mem-aperture = <0xe0000000 0x8000000>;
+               pcie-io-aperture  = <0xe8000000 0x100000>;
+
+               devbus-bootcs {
+                       compatible = "marvell,mvebu-devbus";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10400 0x8>;
+                       ranges = <0 MBUS_ID(0x01, 0x2f) 0 0xffffffff>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
+
+               devbus-cs0 {
+                       compatible = "marvell,mvebu-devbus";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10408 0x8>;
+                       ranges = <0 MBUS_ID(0x01, 0x3e) 0 0xffffffff>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
+
+               devbus-cs1 {
+                       compatible = "marvell,mvebu-devbus";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10410 0x8>;
+                       ranges = <0 MBUS_ID(0x01, 0x3d) 0 0xffffffff>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
+
+               devbus-cs2 {
+                       compatible = "marvell,mvebu-devbus";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10418 0x8>;
+                       ranges = <0 MBUS_ID(0x01, 0x3b) 0 0xffffffff>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
+
+               devbus-cs3 {
+                       compatible = "marvell,mvebu-devbus";
+                       reg = <MBUS_ID(0xf0, 0x01) 0x10420 0x8>;
+                       ranges = <0 MBUS_ID(0x01, 0x37) 0 0xffffffff>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       clocks = <&coreclk 0>;
+                       status = "disabled";
+               };
 
                internal-regs {
                        compatible = "simple-bus";
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       ranges;
+                       ranges = <0 MBUS_ID(0xf0, 0x01) 0 0x100000>;
+
+                       mbusc: mbus-controller@20000 {
+                               compatible = "marvell,mbus-controller";
+                               reg = <0x20000 0x100>, <0x20180 0x20>;
+                       };
 
                        mpic: interrupt-controller@20000 {
                                compatible = "marvell,mpic";
@@ -81,10 +138,8 @@
                        };
 
                        timer@20300 {
-                               compatible = "marvell,armada-370-xp-timer";
                                reg = <0x20300 0x30>, <0x21040 0x30>;
                                interrupts = <37>, <38>, <39>, <40>, <5>, <6>;
-                               clocks = <&coreclk 2>;
                        };
 
                        sata@a0000 {
@@ -195,50 +250,6 @@
                                status = "disabled";
                        };
 
-                       devbus-bootcs@10400 {
-                               compatible = "marvell,mvebu-devbus";
-                               reg = <0x10400 0x8>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
-                       devbus-cs0@10408 {
-                               compatible = "marvell,mvebu-devbus";
-                               reg = <0x10408 0x8>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
-                       devbus-cs1@10410 {
-                               compatible = "marvell,mvebu-devbus";
-                               reg = <0x10410 0x8>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
-                       devbus-cs2@10418 {
-                               compatible = "marvell,mvebu-devbus";
-                               reg = <0x10418 0x8>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
-
-                       devbus-cs3@10420 {
-                               compatible = "marvell,mvebu-devbus";
-                               reg = <0x10420 0x8>;
-                               #address-cells = <1>;
-                               #size-cells = <1>;
-                               clocks = <&coreclk 0>;
-                               status = "disabled";
-                       };
                };
        };
  };