]> git.kernelconcepts.de Git - karo-tx-linux.git/blobdiff - arch/arm/boot/dts/armada-xp-mv78230.dtsi
Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc
[karo-tx-linux.git] / arch / arm / boot / dts / armada-xp-mv78230.dtsi
index ab40f961384f1ac2a57390e70fa4a3e1891d92b4..0358a33cba489d40c97fda0a1bd7cb5769ade9b8 100644 (file)
@@ -13,7 +13,7 @@
  * common to all Armada XP SoCs.
  */
 
-/include/ "armada-xp.dtsi"
+#include "armada-xp.dtsi"
 
 / {
        model = "Marvell Armada XP MV78230 SoC";
        };
 
        soc {
+               /*
+                * MV78230 has 2 PCIe units Gen2.0: One unit can be
+                * configured as x4 or quad x1 lanes. One unit is
+                * x4/x1.
+                */
+               pcie-controller {
+                       compatible = "marvell,armada-xp-pcie";
+                       status = "disabled";
+                       device_type = "pci";
+
+                       #address-cells = <3>;
+                       #size-cells = <2>;
+
+                       bus-range = <0x00 0xff>;
+
+                       ranges =
+                              <0x82000000 0 0x40000 MBUS_ID(0xf0, 0x01) 0x40000 0 0x00002000   /* Port 0.0 registers */
+                               0x82000000 0 0x42000 MBUS_ID(0xf0, 0x01) 0x42000 0 0x00002000   /* Port 2.0 registers */
+                               0x82000000 0 0x44000 MBUS_ID(0xf0, 0x01) 0x44000 0 0x00002000   /* Port 0.1 registers */
+                               0x82000000 0 0x48000 MBUS_ID(0xf0, 0x01) 0x48000 0 0x00002000   /* Port 0.2 registers */
+                               0x82000000 0 0x4c000 MBUS_ID(0xf0, 0x01) 0x4c000 0 0x00002000   /* Port 0.3 registers */
+                               0x82000000 0x1 0       MBUS_ID(0x04, 0xe8) 0 1 0 /* Port 0.0 MEM */
+                               0x81000000 0x1 0       MBUS_ID(0x04, 0xe0) 0 1 0 /* Port 0.0 IO  */
+                               0x82000000 0x2 0       MBUS_ID(0x04, 0xd8) 0 1 0 /* Port 0.1 MEM */
+                               0x81000000 0x2 0       MBUS_ID(0x04, 0xd0) 0 1 0 /* Port 0.1 IO  */
+                               0x82000000 0x3 0       MBUS_ID(0x04, 0xb8) 0 1 0 /* Port 0.2 MEM */
+                               0x81000000 0x3 0       MBUS_ID(0x04, 0xb0) 0 1 0 /* Port 0.2 IO  */
+                               0x82000000 0x4 0       MBUS_ID(0x04, 0x78) 0 1 0 /* Port 0.3 MEM */
+                               0x81000000 0x4 0       MBUS_ID(0x04, 0x70) 0 1 0 /* Port 0.3 IO  */
+                               0x82000000 0x9 0       MBUS_ID(0x04, 0xf8) 0 1 0 /* Port 2.0 MEM */
+                               0x81000000 0x9 0       MBUS_ID(0x04, 0xf0) 0 1 0 /* Port 2.0 IO  */>;
+
+                       pcie@1,0 {
+                               device_type = "pci";
+                               assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
+                               reg = <0x0800 0 0 0 0>;
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               #interrupt-cells = <1>;
+                               ranges = <0x82000000 0 0 0x82000000 0x1 0 1 0
+                                         0x81000000 0 0 0x81000000 0x1 0 1 0>;
+                               interrupt-map-mask = <0 0 0 0>;
+                               interrupt-map = <0 0 0 0 &mpic 58>;
+                               marvell,pcie-port = <0>;
+                               marvell,pcie-lane = <0>;
+                               clocks = <&gateclk 5>;
+                               status = "disabled";
+                       };
+
+                       pcie@2,0 {
+                               device_type = "pci";
+                               assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
+                               reg = <0x1000 0 0 0 0>;
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               #interrupt-cells = <1>;
+                               ranges = <0x82000000 0 0 0x82000000 0x2 0 1 0
+                                         0x81000000 0 0 0x81000000 0x2 0 1 0>;
+                               interrupt-map-mask = <0 0 0 0>;
+                               interrupt-map = <0 0 0 0 &mpic 59>;
+                               marvell,pcie-port = <0>;
+                               marvell,pcie-lane = <1>;
+                               clocks = <&gateclk 6>;
+                               status = "disabled";
+                       };
+
+                       pcie@3,0 {
+                               device_type = "pci";
+                               assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
+                               reg = <0x1800 0 0 0 0>;
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               #interrupt-cells = <1>;
+                               ranges = <0x82000000 0 0 0x82000000 0x3 0 1 0
+                                         0x81000000 0 0 0x81000000 0x3 0 1 0>;
+                               interrupt-map-mask = <0 0 0 0>;
+                               interrupt-map = <0 0 0 0 &mpic 60>;
+                               marvell,pcie-port = <0>;
+                               marvell,pcie-lane = <2>;
+                               clocks = <&gateclk 7>;
+                               status = "disabled";
+                       };
+
+                       pcie@4,0 {
+                               device_type = "pci";
+                               assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
+                               reg = <0x2000 0 0 0 0>;
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               #interrupt-cells = <1>;
+                               ranges = <0x82000000 0 0 0x82000000 0x4 0 1 0
+                                         0x81000000 0 0 0x81000000 0x4 0 1 0>;
+                               interrupt-map-mask = <0 0 0 0>;
+                               interrupt-map = <0 0 0 0 &mpic 61>;
+                               marvell,pcie-port = <0>;
+                               marvell,pcie-lane = <3>;
+                               clocks = <&gateclk 8>;
+                               status = "disabled";
+                       };
+
+                       pcie@9,0 {
+                               device_type = "pci";
+                               assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
+                               reg = <0x4800 0 0 0 0>;
+                               #address-cells = <3>;
+                               #size-cells = <2>;
+                               #interrupt-cells = <1>;
+                               ranges = <0x82000000 0 0 0x82000000 0x9 0 1 0
+                                         0x81000000 0 0 0x81000000 0x9 0 1 0>;
+                               interrupt-map-mask = <0 0 0 0>;
+                               interrupt-map = <0 0 0 0 &mpic 99>;
+                               marvell,pcie-port = <2>;
+                               marvell,pcie-lane = <0>;
+                               clocks = <&gateclk 26>;
+                               status = "disabled";
+                       };
+               };
+
                internal-regs {
                        pinctrl {
                                compatible = "marvell,mv78230-pinctrl";
                                #interrupt-cells = <2>;
                                interrupts = <87>, <88>, <89>;
                        };
-
-                       /*
-                        * MV78230 has 2 PCIe units Gen2.0: One unit can be
-                        * configured as x4 or quad x1 lanes. One unit is
-                        * x4/x1.
-                        */
-                       pcie-controller {
-                               compatible = "marvell,armada-xp-pcie";
-                               status = "disabled";
-                               device_type = "pci";
-
-#address-cells = <3>;
-#size-cells = <2>;
-
-                               bus-range = <0x00 0xff>;
-
-                               ranges = <0x82000000 0 0x40000 0x40000 0 0x00002000   /* Port 0.0 registers */
-                                       0x82000000 0 0x42000 0x42000 0 0x00002000   /* Port 2.0 registers */
-                                       0x82000000 0 0x44000 0x44000 0 0x00002000   /* Port 0.1 registers */
-                                       0x82000000 0 0x48000 0x48000 0 0x00002000   /* Port 0.2 registers */
-                                       0x82000000 0 0x4c000 0x4c000 0 0x00002000   /* Port 0.3 registers */
-                                       0x82000000 0 0xe0000000 0xe0000000 0 0x08000000   /* non-prefetchable memory */
-                                       0x81000000 0 0    0xe8000000 0 0x00100000>; /* downstream I/O */
-
-                               pcie@1,0 {
-                                       device_type = "pci";
-                                       assigned-addresses = <0x82000800 0 0x40000 0 0x2000>;
-                                       reg = <0x0800 0 0 0 0>;
-                                       #address-cells = <3>;
-                                       #size-cells = <2>;
-                                       #interrupt-cells = <1>;
-                                       ranges;
-                                       interrupt-map-mask = <0 0 0 0>;
-                                       interrupt-map = <0 0 0 0 &mpic 58>;
-                                       marvell,pcie-port = <0>;
-                                       marvell,pcie-lane = <0>;
-                                       clocks = <&gateclk 5>;
-                                       status = "disabled";
-                               };
-
-                               pcie@2,0 {
-                                       device_type = "pci";
-                                       assigned-addresses = <0x82000800 0 0x44000 0 0x2000>;
-                                       reg = <0x1000 0 0 0 0>;
-                                       #address-cells = <3>;
-                                       #size-cells = <2>;
-                                       #interrupt-cells = <1>;
-                                       ranges;
-                                       interrupt-map-mask = <0 0 0 0>;
-                                       interrupt-map = <0 0 0 0 &mpic 59>;
-                                       marvell,pcie-port = <0>;
-                                       marvell,pcie-lane = <1>;
-                                       clocks = <&gateclk 6>;
-                                       status = "disabled";
-                               };
-
-                               pcie@3,0 {
-                                       device_type = "pci";
-                                       assigned-addresses = <0x82000800 0 0x48000 0 0x2000>;
-                                       reg = <0x1800 0 0 0 0>;
-                                       #address-cells = <3>;
-                                       #size-cells = <2>;
-                                       #interrupt-cells = <1>;
-                                       ranges;
-                                       interrupt-map-mask = <0 0 0 0>;
-                                       interrupt-map = <0 0 0 0 &mpic 60>;
-                                       marvell,pcie-port = <0>;
-                                       marvell,pcie-lane = <2>;
-                                       clocks = <&gateclk 7>;
-                                       status = "disabled";
-                               };
-
-                               pcie@4,0 {
-                                       device_type = "pci";
-                                       assigned-addresses = <0x82000800 0 0x4c000 0 0x2000>;
-                                       reg = <0x2000 0 0 0 0>;
-                                       #address-cells = <3>;
-                                       #size-cells = <2>;
-                                       #interrupt-cells = <1>;
-                                       ranges;
-                                       interrupt-map-mask = <0 0 0 0>;
-                                       interrupt-map = <0 0 0 0 &mpic 61>;
-                                       marvell,pcie-port = <0>;
-                                       marvell,pcie-lane = <3>;
-                                       clocks = <&gateclk 8>;
-                                       status = "disabled";
-                               };
-
-                               pcie@9,0 {
-                                       device_type = "pci";
-                                       assigned-addresses = <0x82000800 0 0x42000 0 0x2000>;
-                                       reg = <0x4800 0 0 0 0>;
-                                       #address-cells = <3>;
-                                       #size-cells = <2>;
-                                       #interrupt-cells = <1>;
-                                       ranges;
-                                       interrupt-map-mask = <0 0 0 0>;
-                                       interrupt-map = <0 0 0 0 &mpic 99>;
-                                       marvell,pcie-port = <2>;
-                                       marvell,pcie-lane = <0>;
-                                       clocks = <&gateclk 26>;
-                                       status = "disabled";
-                               };
-                       };
                };
        };
 };