]> Git Repo - linux.git/commitdiff
Merge tag 'dt-3.12' of git://git.infradead.org/linux-mvebu into next/soc
authorOlof Johansson <[email protected]>
Thu, 29 Aug 2013 17:01:40 +0000 (10:01 -0700)
committerOlof Johansson <[email protected]>
Thu, 29 Aug 2013 17:01:40 +0000 (10:01 -0700)
From Jason Cooper:
mvebu dt changes for v3.12
 - kirkwood
    - add ZyXEL NSA310 board, fan for ReadyNAS Duo v2
 - mvebu
    - add ReadyNAS 102 board
 - misc dts updates and changes.

v2:
 - dropped mv64xxx-i2c change

* tag 'dt-3.12' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: Fix the Armada 370/XP timer compatible strings
  ARM: mvebu: use dts pre-processor for readynas 102
  ARM: kirkwood: use dts pre-processor for nsa310 boards
  ARM: mvebu: use correct #interrupt-cells instead of #interrupts-cells
  ARM: Kirkwood: Add support for another ZyXEL NSA310 variant
  ARM: mvebu: Add Netgear ReadyNAS 102 board
  arm: kirkwood: readynas duo v2: Add GMT G762 Fan Controller

Signed-off-by: Olof Johansson <[email protected]>
Conflicts:
arch/arm/boot/dts/kirkwood-nsa310.dts

1  2 
arch/arm/boot/dts/Makefile
arch/arm/boot/dts/armada-370-xp.dtsi
arch/arm/boot/dts/armada-370.dtsi
arch/arm/boot/dts/armada-xp-mv78230.dtsi
arch/arm/boot/dts/armada-xp-mv78260.dtsi
arch/arm/boot/dts/armada-xp-mv78460.dtsi
arch/arm/boot/dts/armada-xp.dtsi
arch/arm/boot/dts/kirkwood-netgear_readynas_duo_v2.dts
arch/arm/boot/dts/kirkwood-nsa310.dts

index 0537a23b9dcfb8862929626e5d0eb69c6c9ee512,3d4b882a0e29e9ebfa530d12a52d4e44d44c0d7d..80b9d903cba96dbc68e42902d1acc1efc2ddebd9
@@@ -89,6 -89,7 +89,7 @@@ dtb-$(CONFIG_ARCH_KIRKWOOD) += kirkwood
        kirkwood-ns2max.dtb \
        kirkwood-ns2mini.dtb \
        kirkwood-nsa310.dtb \
+       kirkwood-nsa310a.dtb \
        kirkwood-sheevaplug.dtb \
        kirkwood-sheevaplug-esata.dtb \
        kirkwood-topkick.dtb \
@@@ -100,8 -101,8 +101,9 @@@ dtb-$(CONFIG_ARCH_MSM) += msm8660-surf.
        msm8960-cdp.dtb
  dtb-$(CONFIG_ARCH_MVEBU) += armada-370-db.dtb \
        armada-370-mirabox.dtb \
+       armada-370-netgear-rn102.dtb \
        armada-370-rd.dtb \
 +      armada-xp-axpwifiap.dtb \
        armada-xp-db.dtb \
        armada-xp-gp.dtb \
        armada-xp-openblocks-ax3-4.dtb
@@@ -113,8 -114,6 +115,8 @@@ dtb-$(CONFIG_ARCH_MXC) += 
        imx27-pdk.dtb \
        imx27-phytec-phycore-som.dtb \
        imx27-phytec-phycore-rdk.dtb \
 +      imx27-phytec-phycard-s-som.dtb \
 +      imx27-phytec-phycard-s-rdk.dtb \
        imx31-bug.dtb \
        imx51-apf51.dtb \
        imx51-apf51dev.dtb \
        imx6q-sabrelite.dtb \
        imx6q-sabresd.dtb \
        imx6q-sbc6x.dtb \
 +      imx6q-wandboard.dtb \
        imx6sl-evk.dtb \
        vf610-twr.dtb
  dtb-$(CONFIG_ARCH_MXS) += imx23-evk.dtb \
@@@ -187,7 -185,6 +189,7 @@@ dtb-$(CONFIG_ARCH_U8500) += snowball.dt
        ccu9540.dtb
  dtb-$(CONFIG_ARCH_S3C24XX) += s3c2416-smdk2416.dtb
  dtb-$(CONFIG_ARCH_SHMOBILE) += emev2-kzm9d.dtb \
 +      emev2-kzm9d-reference.dtb \
        r8a7740-armadillo800eva.dtb \
        r8a7778-bockw.dtb \
        r8a7740-armadillo800eva-reference.dtb \
index e984ce6bb33f0742e61c4815dabf50175e27a9e8,442c84e3c8dad4611cb2067e31b49f23d63945f5..1de2dae0fdae6f6353169dc423d75e07d4f65f6f
@@@ -18,8 -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";
        };
  
        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";
                        };
  
                        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 {
                                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";
 -                      };
                };
        };
   };
index 648e5303446e6f49dc813e229450288e470fafae,472433cb4c15ca14de4e3dfde459b3cd4bd7fd9a..e134d7a90c9ab9a5d24bfb500ed9206875f8f033
@@@ -15,7 -15,7 +15,7 @@@
   * common to all Armada SoCs.
   */
  
 -/include/ "armada-370-xp.dtsi"
 +#include "armada-370-xp.dtsi"
  /include/ "skeleton.dtsi"
  
  / {
        };
  
        soc {
 -              ranges = <0          0xd0000000 0x0100000 /* internal registers */
 -                        0xe0000000 0xe0000000 0x8100000 /* PCIe */>;
 +              compatible = "marvell,armada370-mbus", "simple-bus";
 +
 +              bootrom {
 +                      compatible = "marvell,bootrom";
 +                      reg = <MBUS_ID(0x01, 0xe0) 0 0x100000>;
 +              };
 +
 +              pcie-controller {
 +                      compatible = "marvell,armada-370-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
 +                              0x82000000 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000
 +                              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(0x08, 0xe8) 0       1 0 /* Port 1.0 MEM */
 +                              0x81000000 0x2 0     MBUS_ID(0x08, 0xe0) 0       1 0 /* Port 1.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 = <0x82002800 0 0x80000 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 62>;
 +                              marvell,pcie-port = <1>;
 +                              marvell,pcie-lane = <0>;
 +                              clocks = <&gateclk 9>;
 +                              status = "disabled";
 +                      };
 +              };
 +
                internal-regs {
                        system-controller@18200 {
                                compatible = "marvell,armada-370-xp-system-controller";
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <82>, <83>, <84>, <85>;
                        };
  
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <87>, <88>, <89>, <90>;
                        };
  
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <91>;
                        };
  
+                       timer@20300 {
+                               compatible = "marvell,armada-370-timer";
+                               clocks = <&coreclk 2>;
+                       };
                        coreclk: mvebu-sar@18230 {
                                compatible = "marvell,armada-370-core-clock";
                                reg = <0x18230 0x08>;
                                        0x18304 0x4>;
                                status = "okay";
                        };
 -
 -                      pcie-controller {
 -                              compatible = "marvell,armada-370-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 0x80000 0x80000 0 0x00002000   /* Port 1.0 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 = <0x82002800 0 0x80000 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 62>;
 -                                      marvell,pcie-port = <1>;
 -                                      marvell,pcie-lane = <0>;
 -                                      clocks = <&gateclk 9>;
 -                                      status = "disabled";
 -                              };
 -                      };
                };
        };
  };
index e45e363cc9b9766c7ca0270da1699e8d620d1d8b,ab40f961384f1ac2a57390e70fa4a3e1891d92b4..0358a33cba489d40c97fda0a1bd7cb5769ade9b8
@@@ -13,7 -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";
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <82>, <83>, <84>, <85>;
                        };
  
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #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";
 -                              };
 -                      };
                };
        };
  };
index 6dc3921df9b39098fa788dc1a3b274b678393746,254bd24191b6a19c35ed1c054e0b1cafdd55d422..0e82c5062243f2d20f608bbc36d80faf37645abd
@@@ -13,7 -13,7 +13,7 @@@
   * common to all Armada XP SoCs.
   */
  
 -/include/ "armada-xp.dtsi"
 +#include "armada-xp.dtsi"
  
  / {
        model = "Marvell Armada XP MV78260 SoC";
        };
  
        soc {
 +              /*
 +               * MV78260 has 3 PCIe units Gen2.0: Two units 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 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000   /* Port 1.0 registers */
 +                              0x82000000 0 0x82000 MBUS_ID(0xf0, 0x01) 0x82000 0 0x00002000   /* Port 3.0 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(0x08, 0xe8) 0 1 0 /* Port 1.0 MEM */
 +                              0x81000000 0x9 0     MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 1.0 IO  */
 +                              0x82000000 0xa 0     MBUS_ID(0x08, 0xf8) 0 1 0 /* Port 3.0 MEM */
 +                              0x81000000 0xa 0     MBUS_ID(0x08, 0xf0) 0 1 0 /* Port 3.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";
 +                      };
 +
 +                      pcie@10,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82000800 0 0x82000 0 0x2000>;
 +                              reg = <0x5000 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges = <0x82000000 0 0 0x82000000 0xa 0 1 0
 +                                        0x81000000 0 0 0x81000000 0xa 0 1 0>;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 103>;
 +                              marvell,pcie-port = <3>;
 +                              marvell,pcie-lane = <0>;
 +                              clocks = <&gateclk 27>;
 +                              status = "disabled";
 +                      };
 +              };
 +
                internal-regs {
                        pinctrl {
                                compatible = "marvell,mv78260-pinctrl";
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <82>, <83>, <84>, <85>;
                        };
  
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <87>, <88>, <89>, <90>;
                        };
  
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <91>;
                        };
  
                                clocks = <&gateclk 1>;
                                status = "disabled";
                        };
 -
 -                      /*
 -                       * MV78260 has 3 PCIe units Gen2.0: Two units 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 0x80000 0x80000 0 0x00002000   /* Port 1.0 registers */
 -                                      0x82000000 0 0x82000 0x82000 0 0x00002000   /* Port 3.0 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";
 -                              };
 -
 -                              pcie@10,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82000800 0 0x82000 0 0x2000>;
 -                                      reg = <0x5000 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 103>;
 -                                      marvell,pcie-port = <3>;
 -                                      marvell,pcie-lane = <0>;
 -                                      clocks = <&gateclk 27>;
 -                                      status = "disabled";
 -                              };
 -                      };
                };
        };
  };
index a6661e3aea2362721a81e98efd2a502046ef5c7f,9bb9620e425e29b0676e50794a7c5af2b138b8d4..e82c1b80af171e3915b6e09f95bfb9078d0b0201
@@@ -13,7 -13,7 +13,7 @@@
   * common to all Armada XP SoCs.
   */
  
 -/include/ "armada-xp.dtsi"
 +#include "armada-xp.dtsi"
  
  / {
        model = "Marvell Armada XP MV78460 SoC";
        };
  
        soc {
 +              /*
 +               * MV78460 has 4 PCIe units Gen2.0: Two units can be
 +               * configured as x4 or quad x1 lanes. Two units are
 +               * 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 0 0x80000 MBUS_ID(0xf0, 0x01) 0x80000 0 0x00002000   /* Port 1.0 registers */
 +                              0x82000000 0 0x82000 MBUS_ID(0xf0, 0x01) 0x82000 0 0x00002000   /* Port 3.0 registers */
 +                              0x82000000 0 0x84000 MBUS_ID(0xf0, 0x01) 0x84000 0 0x00002000   /* Port 1.1 registers */
 +                              0x82000000 0 0x88000 MBUS_ID(0xf0, 0x01) 0x88000 0 0x00002000   /* Port 1.2 registers */
 +                              0x82000000 0 0x8c000 MBUS_ID(0xf0, 0x01) 0x8c000 0 0x00002000   /* Port 1.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 0x5 0     MBUS_ID(0x08, 0xe8) 0 1 0 /* Port 1.0 MEM */
 +                              0x81000000 0x5 0     MBUS_ID(0x08, 0xe0) 0 1 0 /* Port 1.0 IO  */
 +                              0x82000000 0x6 0     MBUS_ID(0x08, 0xd8) 0 1 0 /* Port 1.1 MEM */
 +                              0x81000000 0x6 0     MBUS_ID(0x08, 0xd0) 0 1 0 /* Port 1.1 IO  */
 +                              0x82000000 0x7 0     MBUS_ID(0x08, 0xb8) 0 1 0 /* Port 1.2 MEM */
 +                              0x81000000 0x7 0     MBUS_ID(0x08, 0xb0) 0 1 0 /* Port 1.2 IO  */
 +                              0x82000000 0x8 0     MBUS_ID(0x08, 0x78) 0 1 0 /* Port 1.3 MEM */
 +                              0x81000000 0x8 0     MBUS_ID(0x08, 0x70) 0 1 0 /* Port 1.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  */
 +
 +                              0x82000000 0xa 0     MBUS_ID(0x08, 0xf8) 0 1 0 /* Port 3.0 MEM */
 +                              0x81000000 0xa 0     MBUS_ID(0x08, 0xf0) 0 1 0 /* Port 3.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 = <0x82001000 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 = <0x82001800 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 = <0x82002000 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@5,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
 +                              reg = <0x2800 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges = <0x82000000 0 0 0x82000000 0x5 0 1 0
 +                                        0x81000000 0 0 0x81000000 0x5 0 1 0>;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 62>;
 +                              marvell,pcie-port = <1>;
 +                              marvell,pcie-lane = <0>;
 +                              clocks = <&gateclk 9>;
 +                              status = "disabled";
 +                      };
 +
 +                      pcie@6,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
 +                              reg = <0x3000 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges = <0x82000000 0 0 0x82000000 0x6 0 1 0
 +                                        0x81000000 0 0 0x81000000 0x6 0 1 0>;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 63>;
 +                              marvell,pcie-port = <1>;
 +                              marvell,pcie-lane = <1>;
 +                              clocks = <&gateclk 10>;
 +                              status = "disabled";
 +                      };
 +
 +                      pcie@7,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
 +                              reg = <0x3800 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges = <0x82000000 0 0 0x82000000 0x7 0 1 0
 +                                        0x81000000 0 0 0x81000000 0x7 0 1 0>;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 64>;
 +                              marvell,pcie-port = <1>;
 +                              marvell,pcie-lane = <2>;
 +                              clocks = <&gateclk 11>;
 +                              status = "disabled";
 +                      };
 +
 +                      pcie@8,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
 +                              reg = <0x4000 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges = <0x82000000 0 0 0x82000000 0x8 0 1 0
 +                                        0x81000000 0 0 0x81000000 0x8 0 1 0>;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 65>;
 +                              marvell,pcie-port = <1>;
 +                              marvell,pcie-lane = <3>;
 +                              clocks = <&gateclk 12>;
 +                              status = "disabled";
 +                      };
 +
 +                      pcie@9,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82004800 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";
 +                      };
 +
 +                      pcie@10,0 {
 +                              device_type = "pci";
 +                              assigned-addresses = <0x82005000 0 0x82000 0 0x2000>;
 +                              reg = <0x5000 0 0 0 0>;
 +                              #address-cells = <3>;
 +                              #size-cells = <2>;
 +                              #interrupt-cells = <1>;
 +                              ranges = <0x82000000 0 0 0x82000000 0xa 0 1 0
 +                                        0x81000000 0 0 0x81000000 0xa 0 1 0>;
 +                              interrupt-map-mask = <0 0 0 0>;
 +                              interrupt-map = <0 0 0 0 &mpic 103>;
 +                              marvell,pcie-port = <3>;
 +                              marvell,pcie-lane = <0>;
 +                              clocks = <&gateclk 27>;
 +                              status = "disabled";
 +                      };
 +              };
 +
                internal-regs {
                        pinctrl {
                                compatible = "marvell,mv78460-pinctrl";
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <82>, <83>, <84>, <85>;
                        };
  
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <87>, <88>, <89>, <90>;
                        };
  
                                gpio-controller;
                                #gpio-cells = <2>;
                                interrupt-controller;
-                               #interrupts-cells = <2>;
+                               #interrupt-cells = <2>;
                                interrupts = <91>;
                        };
  
                                clocks = <&gateclk 1>;
                                status = "disabled";
                        };
 -
 -                      /*
 -                       * MV78460 has 4 PCIe units Gen2.0: Two units can be
 -                       * configured as x4 or quad x1 lanes. Two units are
 -                       * 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 0x80000 0x80000 0 0x00002000   /* Port 1.0 registers */
 -                                      0x82000000 0 0x82000 0x82000 0 0x00002000   /* Port 3.0 registers */
 -                                      0x82000000 0 0x84000 0x84000 0 0x00002000   /* Port 1.1 registers */
 -                                      0x82000000 0 0x88000 0x88000 0 0x00002000   /* Port 1.2 registers */
 -                                      0x82000000 0 0x8c000 0x8c000 0 0x00002000   /* Port 1.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 = <0x82001000 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 = <0x82001800 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 = <0x82002000 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@5,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82002800 0 0x80000 0 0x2000>;
 -                                      reg = <0x2800 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 62>;
 -                                      marvell,pcie-port = <1>;
 -                                      marvell,pcie-lane = <0>;
 -                                      clocks = <&gateclk 9>;
 -                                      status = "disabled";
 -                              };
 -
 -                              pcie@6,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82003000 0 0x84000 0 0x2000>;
 -                                      reg = <0x3000 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 63>;
 -                                      marvell,pcie-port = <1>;
 -                                      marvell,pcie-lane = <1>;
 -                                      clocks = <&gateclk 10>;
 -                                      status = "disabled";
 -                              };
 -
 -                              pcie@7,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82003800 0 0x88000 0 0x2000>;
 -                                      reg = <0x3800 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 64>;
 -                                      marvell,pcie-port = <1>;
 -                                      marvell,pcie-lane = <2>;
 -                                      clocks = <&gateclk 11>;
 -                                      status = "disabled";
 -                              };
 -
 -                              pcie@8,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82004000 0 0x8c000 0 0x2000>;
 -                                      reg = <0x4000 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 65>;
 -                                      marvell,pcie-port = <1>;
 -                                      marvell,pcie-lane = <3>;
 -                                      clocks = <&gateclk 12>;
 -                                      status = "disabled";
 -                              };
 -                              pcie@9,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82004800 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";
 -                              };
 -
 -                              pcie@10,0 {
 -                                      device_type = "pci";
 -                                      assigned-addresses = <0x82005000 0 0x82000 0 0x2000>;
 -                                      reg = <0x5000 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 103>;
 -                                      marvell,pcie-port = <3>;
 -                                      marvell,pcie-lane = <0>;
 -                                      clocks = <&gateclk 27>;
 -                                      status = "disabled";
 -                              };
 -                      };
                };
        };
  };
index 7ba99ce107bb6b5655e79aafa612a918fe76d217,549151ed6632ed7539c85b50e13dd484683ca805..def125c0eeaa1596892f5cda162667d99853827c
@@@ -16,7 -16,7 +16,7 @@@
   * common to all Armada SoCs.
   */
  
 -/include/ "armada-370-xp.dtsi"
 +#include "armada-370-xp.dtsi"
  
  / {
        model = "Marvell Armada XP family SoC";
        };
  
        soc {
 +              compatible = "marvell,armadaxp-mbus", "simple-bus";
 +
 +              bootrom {
 +                      compatible = "marvell,bootrom";
 +                      reg = <MBUS_ID(0x01, 0x1d) 0 0x100000>;
 +              };
 +
                internal-regs {
                        L2: l2-cache {
                                compatible = "marvell,aurora-system-cache";
@@@ -69,7 -62,7 +69,7 @@@
                        };
  
                        timer@20300 {
-                               marvell,timer-25Mhz;
+                               compatible = "marvell,armada-xp-timer";
                        };
  
                        coreclk: mvebu-sar@18230 {
index 84ff31cfbcdc6909443d096572cd62148a2908c3,cc43d247b1b5bfab20a29e5c42bd973760f766bd..cc40f19ae3fc2b17b8bc16606e74ba0c3f53306d
@@@ -1,7 -1,7 +1,7 @@@
  /dts-v1/;
  
 -/include/ "kirkwood.dtsi"
 -/include/ "kirkwood-6282.dtsi"
 +#include "kirkwood.dtsi"
 +#include "kirkwood-6282.dtsi"
  
  / {
        model = "NETGEAR ReadyNAS Duo v2";
                bootargs = "console=ttyS0,115200n8 earlyprintk";
        };
  
 +      mbus {
 +              ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
 +              pcie-controller {
 +                      status = "okay";
 +
 +                      pcie@1,0 {
 +                              status = "okay";
 +                      };
 +              };
 +      };
 +
        ocp@f1000000 {
                pinctrl: pinctrl@10000 {
                        pmx_button_power: pmx-button-power {
                        };
                };
  
+               clocks {
+                      #address-cells = <1>;
+                      #size-cells = <0>;
+                      g762_clk: fixedclk {
+                                compatible = "fixed-clock";
+                                #clock-cells = <0>;
+                                clock-frequency = <8192>;
+                      };
+               };
                i2c@11000 {
                        status = "okay";
  
                                compatible = "ricoh,rs5c372a";
                                reg = <0x32>;
                        };
+                       g762: g762@3e {
+                               compatible = "gmt,g762";
+                               reg = <0x3e>;
+                               clocks = <&g762_clk>; /* input clock */
+                               fan_gear_mode = <0>;
+                               fan_startv = <1>;
+                               pwm_polarity = <0>;
+                       };
                };
  
                serial@12000 {
                        status = "okay";
                        nr-ports = <2>;
                };
 -
 -              pcie-controller {
 -                      status = "okay";
 -
 -                      pcie@1,0 {
 -                              status = "okay";
 -                      };
 -              };
        };
  
        gpio-leds {
index bd7f05f6aa9631bb802e28d1fcc7a7b71d3bac63,ebc3ed9f6c8bf58403634379ae83a045bc5dfc07..7aeae0c2c1f498bd31fd6572b278dbe944eab107
@@@ -1,10 -1,8 +1,8 @@@
  /dts-v1/;
  
- #include "kirkwood.dtsi"
- #include "kirkwood-6281.dtsi"
+ #include "kirkwood-nsa310-common.dtsi"
  
  / {
-       model = "ZyXEL NSA310";
        compatible = "zyxel,nsa310", "marvell,kirkwood-88f6281", "marvell,kirkwood";
  
        memory {
                bootargs = "console=ttyS0,115200";
        };
  
 +      mbus {
 +              ranges = <MBUS_ID(0xf0, 0x01) 0 0xf1000000 0x100000>;
 +              pcie-controller {
 +                      status = "okay";
 +
 +                      pcie@1,0 {
 +                              status = "okay";
 +                      };
 +              };
 +      };
 +
        ocp@f1000000 {
                pinctrl: pinctrl@10000 {
                        pinctrl-0 = <&pmx_unknown>;
                                marvell,function = "gpio";
                        };
  
-                       pmx_usb_power_off: pmx-usb-power-off {
-                               marvell,pins = "mpp21";
-                               marvell,function = "gpio";
-                       };
                        pmx_led_sys_green: pmx-led-sys-green {
                                marvell,pins = "mpp28";
                                marvell,function = "gpio";
                                marvell,pins = "mpp46";
                                marvell,function = "gpio";
                        };
-                       pmx_pwr_off: pmx-pwr-off {
-                               marvell,pins = "mpp48";
-                               marvell,function = "gpio";
-                       };
-               };
-               serial@12000 {
-                       status = "ok";
-               };
-               sata@80000 {
-                       status = "okay";
-                       nr-ports = <2>;
                };
  
                i2c@11000 {
                                reg = <0x2e>;
                        };
                };
-               nand@3000000 {
-                       status = "okay";
-                       chip-delay = <35>;
-                       partition@0 {
-                               label = "uboot";
-                               reg = <0x0000000 0x0100000>;
-                               read-only;
-                       };
-                       partition@100000 {
-                               label = "uboot_env";
-                               reg = <0x0100000 0x0080000>;
-                       };
-                       partition@180000 {
-                               label = "key_store";
-                               reg = <0x0180000 0x0080000>;
-                       };
-                       partition@200000 {
-                               label = "info";
-                               reg = <0x0200000 0x0080000>;
-                       };
-                       partition@280000 {
-                               label = "etc";
-                               reg = <0x0280000 0x0a00000>;
-                       };
-                       partition@c80000 {
-                               label = "kernel_1";
-                               reg = <0x0c80000 0x0a00000>;
-                       };
-                       partition@1680000 {
-                               label = "rootfs1";
-                               reg = <0x1680000 0x2fc0000>;
-                       };
-                       partition@4640000 {
-                               label = "kernel_2";
-                               reg = <0x4640000 0x0a00000>;
-                       };
-                       partition@5040000 {
-                               label = "rootfs2";
-                               reg = <0x5040000 0x2fc0000>;
-                       };
-               };
        };
  
        gpio_keys {
                        gpios = <&gpio1 8 0>;
                };
        };
-       gpio_poweroff {
-               compatible = "gpio-poweroff";
-               pinctrl-0 = <&pmx_pwr_off>;
-               pinctrl-names = "default";
-               gpios = <&gpio1 16 0>;
-       };
-       regulators {
-               compatible = "simple-bus";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               pinctrl-0 = <&pmx_usb_power_off>;
-               pinctrl-names = "default";
-               usb0_power_off: regulator@1 {
-                       compatible = "regulator-fixed";
-                       reg = <1>;
-                       regulator-name = "USB Power Off";
-                       regulator-min-microvolt = <5000000>;
-                       regulator-max-microvolt = <5000000>;
-                       regulator-always-on;
-                       regulator-boot-on;
-                       gpio = <&gpio0 21 0>;
-               };
-       };
  };
This page took 0.129662 seconds and 4 git commands to generate.