This patch moves the common SoC device tree entries
from the currently four supported platforms into a
common apm82181.dtsi.

Furthermore, this patch also changes the GPIO, IRQ and
input definitions of the supported platforms to use the
defined dt-bindings macros for GPIO_ACTIVE_LOW|HIGH,
KEY_WPS|RESTART|*, IRQ_TYPE_* when it's appropriate.

Signed-off-by: Christian Lamparter <chunk...@gmail.com>
---
v1->v2:
        - also converted IRQ_TYPEs
        - rebased on LEDE's current HEAD
        - drop default LED triggers for the MBL
          (except for the panic indicators. They have to work as soon
          as possible. So they can indicate if the rootfs on the HDD
          is damaged, etc...)
---
 target/linux/apm821xx/dts/MR24.dts         | 472 +++------------
 target/linux/apm821xx/dts/apm82181.dtsi    | 470 +++++++++++++++
 target/linux/apm821xx/dts/apollo3g-duo.dts |  19 +
 target/linux/apm821xx/dts/apollo3g.dts     |  18 -
 target/linux/apm821xx/dts/apollo3g.dtsi    | 569 ++++--------------
 target/linux/apm821xx/dts/wndr4700.dts     | 914 +++++++++--------------------
 6 files changed, 990 insertions(+), 1472 deletions(-)
 create mode 100644 target/linux/apm821xx/dts/apm82181.dtsi

diff --git a/target/linux/apm821xx/dts/MR24.dts 
b/target/linux/apm821xx/dts/MR24.dts
index 1e186e6..8d20872 100644
--- a/target/linux/apm821xx/dts/MR24.dts
+++ b/target/linux/apm821xx/dts/MR24.dts
@@ -12,422 +12,140 @@
 
 /dts-v1/;
 
+#include "apm82181.dtsi"
+
 / {
-       #address-cells = <2>;
-       #size-cells = <1>;
        model = "Meraki MR24 Access Point";
        compatible = "meraki,ikarem";
-       dcr-parent = <&{/cpus/cpu@0}>;
 
        aliases {
-               ethernet0 = &EMAC0;
-               serial0 = &UART0;
+               serial0 = &UART1;
        };
 
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               cpu@0 {
-                       device_type = "cpu";
-                       model = "PowerPC,apm821xx";
-                       reg = <0x00000000>;
-                       clock-frequency = <0>; /* Filled in by U-Boot */
-                       timebase-frequency = <0>; /* Filled in by U-Boot */
-                       i-cache-line-size = <32>;
-                       d-cache-line-size = <32>;
-                       i-cache-size = <32768>;
-                       d-cache-size = <32768>;
-                       dcr-controller;
-                       dcr-access-method = "native";
-                       next-level-cache = <&L2C0>;
-               };
+       chosen {
+               linux,stdout-path = "/plb/opb/serial@ef600400";
        };
 
-       memory {
-               device_type = "memory";
-               reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by 
U-Boot */
-       };
+};
 
-       UIC0: interrupt-controller0 {
-               compatible = "ibm,uic";
-               interrupt-controller;
-               cell-index = <0>;
-               dcr-reg = <0x0c0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-       };
 
-       UIC1: interrupt-controller1 {
-               compatible = "ibm,uic";
-               interrupt-controller;
-               cell-index = <1>;
-               dcr-reg = <0x0d0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
+&CRYPTO {
+       status = "okay";
+};
 
-       UIC2: interrupt-controller2 {
-               compatible = "ibm,uic";
-               interrupt-controller;
-               cell-index = <2>;
-               dcr-reg = <0x0e0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
+&PKA {
+       status = "okay";
+};
 
-       UIC3: interrupt-controller3 {
-               compatible = "ibm,uic";
-               interrupt-controller;
-               cell-index = <3>;
-               dcr-reg = <0x0f0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
+&TRNG {
+       status = "okay";
+};
 
-       /* KPH check the following */
-       OCM: ocm@400040000 {
-               compatible = "ibm,ocm";
+&EBC0 {
+       /* Ikarem has 32MB of NAND */
+       ndfc@1,0 {
                status = "okay";
-               cell-index = <1>;
-               /* configured in U-Boot */
-               reg = <4 0x00040000 0x8000>; /* 32K */
-       };
-
-       SDR0: sdr {
-               compatible = "ibm,sdr-apm821xx";
-               dcr-reg = <0x00e 0x002>;
-       };
-
-       CPR0: cpr {
-               compatible = "ibm,cpr-apm821xx";
-               dcr-reg = <0x00c 0x002>;
-       };
-
-       L2C0: l2c {
-               compatible = "ibm,l2-cache-apm82181", "ibm,l2-cache";
-               dcr-reg = <0x020 0x008
-                          0x030 0x008>;
-               cache-line-size = <32>;
-               cache-size = <262144>;
-               interrupt-parent = <&UIC1>;
-               interrupts = <11 1>;
-       };
-
-       /* kph check the below */
-       CPM0: cpm {
-               compatible = "ibm,cpm-apm821xx", "ibm,cpm";
-               cell-index = <0>;
-               dcr-reg = <0x160 0x003>;
-               pm-cpu = <0x02000000>;
-               pm-doze = <0x302570F0>;
-               pm-nap = <0x302570F0>;
-               pm-deepsleep = <0x302570F0>;
-               pm-iic-device = <&IIC0>;
-               pm-emac-device = <&EMAC0>;
-       };
-
-       plb {
-               compatible = "ibm,plb4";
-               #address-cells = <2>;
-               #size-cells = <1>;
-               ranges;
-               clock-frequency = <0>; /* Filled in by U-Boot */
-
-               SDRAM0: sdram {
-                       compatible = "ibm,sdram-apm821xx";
-                       dcr-reg = <0x010 0x002>;
-               };
-
-               /* kph check the below */
-               CRYPTO: crypto@180000 {
-                       compatible = "amcc,ppc460ex-crypto", 
"amcc,ppc4xx-crypto";
-                       reg = <4 0x00180000 0x80400>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <0x1d 0x4>;
-               };
-
-               /* kph check the below */
-               PKA: pka@114000 {
-                       device_type = "pka";
-                       compatible = "ppc4xx-pka", "amcc,ppc4xx-pka";
-                       reg = <4 0x00114000 0x4000>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <0x14 0x2>;
-               };
-
-               /* kph check the below */
-               TRNG: trng@110000 {
-                       compatible = "ppc4xx-trng", "amcc,ppc460ex-rng";
-                       reg = <4 0x00110000 0x50>;
-                       interrupt-parent = <&UIC1>;
-                       interrupts = <0x3 0x2>;
-               };
-
-               MAL0: mcmal {
-                       compatible = "ibm,mcmal2";
-                       descriptor-memory = "ocm";
-                       dcr-reg = <0x180 0x062>;
-                       num-tx-chans = <1>;
-                       num-rx-chans = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       interrupt-parent = <&UIC2>;
-                       interrupts = <  /*TXEOB*/ 0x6 0x4
-                                       /*RXEOB*/ 0x7 0x4
-                                       /*SERR*/  0x3 0x4
-                                       /*TXDE*/  0x4 0x4
-                                       /*RXDE*/  0x5 0x4>;
-               };
-
-               POB0: opb {
-                       compatible = "ibm,opb";
+               /* 32 MiB NAND Flash */
+               nand {
                        #address-cells = <1>;
                        #size-cells = <1>;
-                       ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>;
-                       clock-frequency = <0>; /* Filled in by U-Boot */
 
-                       EBC0: ebc {
-                               compatible = "ibm,ebc";
-                               dcr-reg = <0x012 0x002>;
-                               #address-cells = <2>;
-                               #size-cells = <1>;
-                               clock-frequency = <0>; /* Filled in by U-Boot */
-                               /* ranges property is supplied by U-Boot */
-                               ranges = < 0x00000003 0x00000000 0xe0000000 
0x8000000>;
-                               interrupts = <0x6 0x4>;
-                               interrupt-parent = <&UIC1>;
-
-                               /* Ikarem has 32MB of NAND */
-                               ndfc@1,0 {
-                                       compatible = "ibm,ndfc";
-                                       reg = <00000003 00000000 00000400>;
-                                       ccr = <0x00001000>;
-                                       bank-settings = <0x80002222>;
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       /* 32 MiB NAND Flash */
-                                       nand {
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
-                                               partition@0 {
-                                                       label = "u-boot";
-                                                       reg = <0x00000000 
0x00170000>;
-                                                       read-only;
-                                               };
-                                               partition@170000 {
-                                                       label = "oops";
-                                                       reg = <0x00170000 
0x00010000>;
-                                               };
-                                               partition@180000 {
-                                                       label = "ubi";
-                                                       reg = <0x00180000 
0x01e80000>;
-                                               };
-                                       };
-                               };
-                       };
-
-                       UART0: serial@ef600400 {
-                               device_type = "serial";
-                               compatible = "ns16550";
-                               reg = <0xef600400 0x00000008>;
-                               virtual-reg = <0xef600400>;
-                               clock-frequency = <0>; /* Filled in by U-Boot */
-                               current-speed = <0>; /* Filled in by U-Boot */
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0x1 0x4>;
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x00000000 0x00170000>;
+                               read-only;
                        };
 
-                       GPIO0: gpio@ef600b00 {
-                               compatible = "ibm,ppc4xx-gpio";
-                               reg = <0xef600b00 0x00000048>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
+                       partition@170000 {
+                               label = "oops";
+                               reg = <0x00170000 0x00010000>;
                        };
 
-                       gpio-leds {
-                               compatible = "gpio-leds";
-                               power-green {
-                                       label = "mr24:green:power";
-                                       gpios = <&GPIO0 18 1>;
-                               };
-                               power-orange {
-                                       label = "mr24:orange:power";
-                                       gpios = <&GPIO0 19 1>;
-                               };
-                               lan {
-                                       label = "mr24:green:wan";
-                                       gpios = <&GPIO0 17 1>;
-                               };
-                               ssi-0 {
-                                       label = "mr24:green:wifi1";
-                                       gpios = <&GPIO0 23 1>;
-                               };
-                               ssi-1 {
-                                       label = "mr24:green:wifi2";
-                                       gpios = <&GPIO0 22 1>;
-                               };
-                               ssi-2 {
-                                       label = "mr24:green:wifi3";
-                                       gpios = <&GPIO0 21 1>;
-                               };
-                               ssi-3 {
-                                       label = "mr24:green:wifi4";
-                                       gpios = <&GPIO0 20 1>;
-                               };
+                       partition@180000 {
+                               label = "ubi";
+                               reg = <0x00180000 0x01e80000>;
                        };
+               };
+       };
+};
 
-                       gpio_keys_polled {
-                               compatible = "gpio-keys-polled";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               poll-interval = <60>;   /* 3 * 20 = 60ms */
-                               autorepeat;
-                               button@1 {
-                                       label = "Reset button";
-                                       linux,code = <0x198>; /* KEY_RESTART */
-                                       gpios = <&GPIO0 16 1>;
-                               };
-                       };
+&UART1 {
+       status = "okay";
+};
 
-                       IIC0: i2c@ef600700 {
-                               compatible = "ibm,iic";
-                               reg = <0xef600700 0x00000014>;
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0x2 0x4>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               /* Boot ROM is at 0x52-0x53, do not touch */
-                               /* Unknown chip at 0x6e, not sure what it is */
-                       };
+&GPIO0 {
+       status = "okay";
+};
 
-                       IIC1: i2c@ef600800 {
-                               compatible = "ibm,iic";
-                               reg = <0xef600800 0x00000014>;
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0x3 0x4>;
-                       };
+&IIC0 {
+       status = "okay";
+       /* Boot ROM is at 0x52-0x53, do not touch */
+       /* Unknown chip at 0x6e, not sure what it is */
+};
 
-                       RGMII0: emac-rgmii@ef601500 {
-                               compatible = "ibm,rgmii";
-                               reg = <0xef601500 0x00000008>;
-                               has-mdio;
-                       };
+&EMAC0 {
+       status = "okay";
+};
 
-                       TAH0: emac-tah@ef601350 {
-                               compatible = "ibm,tah";
-                               reg = <0xef601350 0x00000030>;
-                       };
+&POB0 {
+       gpio-leds {
+               compatible = "gpio-leds";
 
-                       EMAC0: ethernet@ef600c00 {
-                               device_type = "network";
-                               compatible = "ibm,emac-apm821xx", 
"ibm,emac4sync";
-                               interrupt-parent = <&EMAC0>;
-                               interrupts = <0x0 0x1>;
-                               #interrupt-cells = <1>;
-                               #address-cells = <0>;
-                               #size-cells = <0>;
-                               interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
-                                                /*Wake*/   0x1 &UIC2 0x14 0x4>;
-                               reg = <0xef600c00 0x000000c4>;
-                               local-mac-address = [000000000000]; /* Filled 
in by U-Boot */
-                               mal-device = <&MAL0>;
-                               mal-tx-channel = <0>;
-                               mal-rx-channel = <0>;
-                               cell-index = <0>;
-                               max-frame-size = <9000>;
-                               rx-fifo-size = <16384>;
-                               tx-fifo-size = <2048>;
-                               phy-mode = "rgmii";
-                               phy-map = <0x00000000>;
-                               rgmii-device = <&RGMII0>;
-                               rgmii-channel = <0>;
-                               tah-device = <&TAH0>;
-                               tah-channel = <0>;
-                               has-inverted-stacr-oc;
-                               has-new-stacr-staopc;
-                       };
+               power-green {
+                       label = "mr24:green:power";
+                       gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
                };
 
-               PCIE0: pciex@d00000000 {
-                       device_type = "pci";
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       compatible = "ibm,plb-pciex-apm821xx", "ibm,plb-pciex";
-                       primary;
-                       port = <0x0>; /* port number */
-                       reg = <0x0000000d 0x00000000 0x20000000 /* Config space 
access */
-                              0x0000000c 0x08010000 0x00001000>;       /* 
Registers */
-                       dcr-reg = <0x100 0x020>;
-                       sdr-base = <0x300>;
+               power-orange {
+                       label = "mr24:orange:power";
+                       gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
+               };
 
-                       /* Outbound ranges, one memory and one IO,
-                        * later cannot be changed
-                        */
-                       ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 
0x00000000 0x00000000 0x80000000
-                                 0x02000000 0x00000000 0x00000000 0x0000000f 
0x00000000 0x00000000 0x00100000
-                                 0x01000000 0x00000000 0x00000000 0x0000000f 
0x80000000 0x00000000 0x00010000>;
+               lan {
+                       label = "mr24:green:wan";
+                       gpios = <&GPIO0 17 GPIO_ACTIVE_LOW>;
+               };
 
-                       /* Inbound 2GB range starting at 0 */
-                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 
0x80000000>;
+               ssi-0 {
+                       label = "mr24:green:wifi1";
+                       gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
+               };
 
-                       /* This drives busses 40 to 0x7f */
-                       bus-range = <0x40 0x7f>;
+               ssi-1 {
+                       label = "mr24:green:wifi2";
+                       gpios = <&GPIO0 22 GPIO_ACTIVE_LOW>;
+               };
 
-                       /* Legacy interrupts (note the weird polarity, the 
bridge seems
-                        * to invert PCIe legacy interrupts).
-                        * We are de-swizzling here because the numbers are 
actually for
-                        * port of the root complex virtual P2P bridge. But I 
want
-                        * to avoid putting a node for it in the tree, so the 
numbers
-                        * below are basically de-swizzled numbers.
-                        * The real slot is on idsel 0, so the swizzling is 1:1
-                        */
-                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
-                       interrupt-map = <
-                               0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A 
*/
-                               0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B 
*/
-                               0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C 
*/
-                               0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D 
*/>;
+               ssi-2 {
+                       label = "mr24:green:wifi3";
+                       gpios = <&GPIO0 21 GPIO_ACTIVE_LOW>;
                };
 
-               MSI: ppc4xx-msi@C10000000 {
-                       compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
-                       reg = < 0xC 0x10000000 0x100
-                               0xC 0x10000000 0x100>;
-                       sdr-base = <0x36C>;
-                       msi-data = <0x00004440>;
-                       msi-mask = <0x0000ffe0>;
-                       interrupts =<0 1 2 3 4 5 6 7>;
-                       interrupt-parent = <&MSI>;
-                       #interrupt-cells = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       msi-available-ranges = <0x0 0x100>;
-                       interrupt-map = <
-                               0 &UIC3 0x18 1
-                               1 &UIC3 0x19 1
-                               2 &UIC3 0x1A 1
-                               3 &UIC3 0x1B 1
-                               4 &UIC3 0x1C 1
-                               5 &UIC3 0x1D 1
-                               6 &UIC3 0x1E 1
-                               7 &UIC3 0x1F 1
-                       >;
+               ssi-3 {
+                       label = "mr24:green:wifi4";
+                       gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
                };
        };
 
-       chosen {
-               linux,stdout-path = "/plb/opb/serial@ef600400";
+       gpio_keys_polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <60>;   /* 3 * 20 = 60ms */
+               autorepeat;
+
+               button@1 {
+                       label = "Reset button";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>;
+               };
        };
 };
+
+&PCIE0 {
+       status = "okay";
+};
+
+&MSI {
+       status = "okay";
+};
diff --git a/target/linux/apm821xx/dts/apm82181.dtsi 
b/target/linux/apm821xx/dts/apm82181.dtsi
new file mode 100644
index 0000000..cc48d20
--- /dev/null
+++ b/target/linux/apm821xx/dts/apm82181.dtsi
@@ -0,0 +1,470 @@
+/*
+ * Device Tree for Bluestone (APM821xx) board.
+ *
+ * Copyright (c) 2010, Applied Micro Circuits Corporation
+ * Author: Tirumala R Marri <tma...@apm.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ *
+ */
+
+#include <dt-bindings/input/input.h>
+#include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/gpio/gpio.h>
+
+/ {
+       #address-cells = <2>;
+       #size-cells = <1>;
+       dcr-parent = <&{/cpus/cpu@0}>;
+       compatible = "apm,bluestone";
+
+       aliases {
+               ethernet0 = &EMAC0;
+       };
+
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               CPU00: cpu@0 {
+                       device_type = "cpu";
+                       model = "PowerPC,apm82181";
+                       reg = <0x00000000>;
+                       clock-frequency = <0>; /* Filled in by U-Boot */
+                       timebase-frequency = <0>; /* Filled in by U-Boot */
+                       i-cache-line-size = <32>;
+                       d-cache-line-size = <32>;
+                       i-cache-size = <32768>;
+                       d-cache-size = <32768>;
+                       dcr-controller;
+                       dcr-access-method = "native";
+                       next-level-cache = <&L2C0>;
+               };
+       };
+
+       memory {
+               device_type = "memory";
+               reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by 
U-Boot */
+       };
+
+       UIC0: interrupt-controller0 {
+               compatible = "apm,uic-apm82181","ibm,uic";
+               interrupt-controller;
+               cell-index = <0>;
+               dcr-reg = <0x0c0 0x009>;
+               #address-cells = <0>;
+               #size-cells = <0>;
+               #interrupt-cells = <2>;
+       };
+
+       UIC1: interrupt-controller1 {
+               compatible = "apm,uic-apm82181","ibm,uic";
+               interrupt-controller;
+               cell-index = <1>;
+               dcr-reg = <0x0d0 0x009>;
+               #address-cells = <0>;
+               #size-cells = <0>;
+               #interrupt-cells = <2>;
+               interrupts = <0x1e IRQ_TYPE_LEVEL_HIGH
+                             0x1f IRQ_TYPE_LEVEL_HIGH>; /* cascade */
+               interrupt-parent = <&UIC0>;
+       };
+
+       UIC2: interrupt-controller2 {
+               compatible = "apm,uic-apm82181","ibm,uic";
+               interrupt-controller;
+               cell-index = <2>;
+               dcr-reg = <0x0e0 0x009>;
+               #address-cells = <0>;
+               #size-cells = <0>;
+               #interrupt-cells = <2>;
+               interrupts = <0x0a IRQ_TYPE_LEVEL_HIGH
+                             0x0b IRQ_TYPE_LEVEL_HIGH>; /* cascade */
+               interrupt-parent = <&UIC0>;
+       };
+
+       UIC3: interrupt-controller3 {
+               compatible = "apm,uic-apm82181","ibm,uic";
+               interrupt-controller;
+               cell-index = <3>;
+               dcr-reg = <0x0f0 0x009>;
+               #address-cells = <0>;
+               #size-cells = <0>;
+               #interrupt-cells = <2>;
+               interrupts = <0x10 IRQ_TYPE_LEVEL_HIGH
+                             0x11 IRQ_TYPE_LEVEL_HIGH>; /* cascade */
+               interrupt-parent = <&UIC0>;
+       };
+
+       OCM1: ocm@400040000 {
+               compatible = "apm,ocm-apm82181", "ibm,ocm";
+               status = "okay";
+               cell-index = <1>;
+               /* configured in U-Boot */
+               reg = <4 0x00040000 0x8000>; /* 32K */
+       };
+
+       SDR0: sdr {
+               compatible = "apm,sdr-apm82181", "ibm,sdr-460ex";
+               dcr-reg = <0x00e 0x002>;
+       };
+
+       CPR0: cpr {
+               compatible = "apm,cpr-apm82181", "ibm,cpr-460ex";
+               dcr-reg = <0x00c 0x002>;
+       };
+
+       L2C0: l2c {
+               compatible = "ibm,l2-cache-apm82181", "ibm,l2-cache";
+               dcr-reg = <0x020 0x008
+                          0x030 0x008>;
+               cache-line-size = <32>;
+               cache-size = <262144>;
+               interrupt-parent = <&UIC1>;
+               interrupts = <0x0b IRQ_TYPE_EDGE_RISING>;
+       };
+
+       CPM0: cpm {
+               compatible = "ibm,cpm-apm821xx", "ibm,cpm";
+               cell-index = <0>;
+               dcr-reg = <0x160 0x003>;
+               pm-cpu = <0x02000000>;
+               pm-doze = <0x302570F0>;
+               pm-nap = <0x302570F0>;
+               pm-deepsleep = <0x302570F0>;
+               pm-iic-device = <&IIC0>;
+               pm-emac-device = <&EMAC0>;
+               unused-units = <0x00000100>;
+               idle-doze = <0x02000000>;
+               standby = <0xfeff791d>;
+       };
+
+       plb {
+               compatible = "apm,plb-apm82181", "ibm,plb-460ex", "ibm,plb4";
+               #address-cells = <2>;
+               #size-cells = <1>;
+               ranges;
+               clock-frequency = <0>; /* Filled in by U-Boot */
+
+               SDRAM0: sdram {
+                       compatible = "apm,sdram-apm82181", "ibm,sdram-460ex", 
"ibm,sdram-405gp";
+                       dcr-reg = <0x010 0x002>;
+               };
+
+               RTC: rtc {
+                       compatible = "ibm,rtc";
+                       dcr-reg = <0x240 0x009>;
+                       interrupts = <0x1a IRQ_TYPE_LEVEL_HIGH>;
+                       interrupt-parent = <&UIC2>;
+
+               };
+
+               CRYPTO: crypto@180000 {
+                       compatible = "amcc,ppc460ex-crypto", 
"amcc,ppc4xx-crypto";
+                       reg = <4 0x00180000 0x80400>;
+                       interrupt-parent = <&UIC0>;
+                       interrupts = <0x1d IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
+               PKA: pka@114000 {
+                       device_type = "pka";
+                       compatible = "ppc4xx-pka", "amcc,ppc4xx-pka", "amcc, 
ppc4xx-pka";
+                       reg = <4 0x00114000 0x4000>;
+                       interrupt-parent = <&UIC0>;
+                       interrupts = <0x14 IRQ_TYPE_EDGE_RISING>;
+                       status = "disabled";
+               };
+
+               TRNG: trng@110000 {
+                       device_type = "trng";
+                       compatible = "amcc,ppc460ex-rng", "ppc4xx-rng", "amcc, 
ppc4xx-trng";
+                       reg = <4 0x00110000 0x100>;
+                       interrupt-parent = <&UIC1>;
+                       interrupts = <0x03 IRQ_TYPE_LEVEL_HIGH>;
+                       status = "disabled";
+               };
+
+               MAL0: mcmal {
+                       compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
+                       descriptor-memory = "ocm";
+                       dcr-reg = <0x180 0x062>;
+                       num-tx-chans = <1>;
+                       num-rx-chans = <1>;
+                       #address-cells = <0>;
+                       #size-cells = <0>;
+                       interrupt-parent = <&UIC2>;
+                       interrupts = <  0x06 IRQ_TYPE_LEVEL_HIGH /*TXEOB*/
+                                       0x07 IRQ_TYPE_LEVEL_HIGH /*RXEOB*/
+                                       0x03 IRQ_TYPE_LEVEL_HIGH /*SERR*/
+                                       0x04 IRQ_TYPE_LEVEL_HIGH /*TXDE*/
+                                       0x05 IRQ_TYPE_LEVEL_HIGH /*RXDE*/
+                                       0x08 IRQ_TYPE_EDGE_FALLING /*TX0 COAL*/
+                                     /*0x09 IRQ_TYPE_EDGE_FALLING   TX1 COAL*/
+                                       0x0c IRQ_TYPE_EDGE_FALLING /*RX0 COAL*/
+                                     /*0x0d IRQ_TYPE_EDGE_FALLING   RX1 
COAL*/>;
+               };
+
+               AHBDMA0: dma@bffd0800 {
+                       compatible = "snps,dma-spear1340";
+                       reg = <4 0xbffd0800 0x400>;
+                       interrupt-parent = <&UIC0>;
+                       interrupts = <0x19 IRQ_TYPE_LEVEL_HIGH>;
+                       #dma-cells = <3>;
+                       /* use autoconfiguration for the dma setup */
+               };
+
+               SATA0: sata@bffd1000 {
+                       compatible = "amcc,sata-460ex";
+                       reg = <4 0xbffd1000 0x800>;
+                       interrupt-parent = <&UIC0>;
+                       interrupts = <0x1a IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&AHBDMA0 0 0 1>;
+                       dma-names = "sata-dma";
+                       status = "disabled";
+               };
+
+               SATA1: sata@bffd1800 {
+                       compatible = "amcc,sata-460ex";
+                       reg = <4 0xbffd1800 0x800>;
+                       interrupt-parent = <&UIC0>;
+                       interrupts = <0x1b IRQ_TYPE_LEVEL_HIGH>;
+                       dmas = <&AHBDMA0 1 0 2>;
+                       dma-names = "sata-dma";
+                       status = "disabled";
+               };
+
+               USBOTG0: usbotg@bff80000 {
+                       compatible = "amcc,usb-otg-405ex";
+                       reg = <4 0xbff80000 0x10000>;
+                       interrupt-parent = <&USBOTG0>;
+                       interrupts = <0 1 2>;
+                       #interrupt-cells = <1>;
+                       #address-cells = <0>;
+                       #size-cells = <0>;
+                       interrupt-map = <0 &UIC2 0x1c IRQ_TYPE_LEVEL_HIGH /* 
USB-OTG */
+                                        1 &UIC1 0x1a IRQ_TYPE_LEVEL_LOW /* 
HIGH-POWER */
+                                        2 &UIC0 0x0c IRQ_TYPE_LEVEL_HIGH /* 
DMA */>;
+                       dr_mode = "host";
+                       status = "disabled";
+               };
+
+               POB0: opb {
+                       compatible = "ibm,opb-460ex", "ibm,opb";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+                       ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>;
+                       clock-frequency = <0>; /* Filled in by U-Boot */
+
+                       EBC0: ebc {
+                               compatible = "ibm,ebc-460ex", "ibm,ebc";
+                               dcr-reg = <0x012 0x002>;
+                               #address-cells = <2>;
+                               #size-cells = <1>;
+                               clock-frequency = <0>; /* Filled in by U-Boot */
+                               /* ranges property is supplied by U-Boot */
+                               ranges = <0x00000003 0x00000000 0xe0000000 
0x8000000>;
+                               interrupts = <0x06 IRQ_TYPE_LEVEL_HIGH>;
+                               interrupt-parent = <&UIC1>;
+
+                               nor_flash@0,0 {
+                                       compatible = "cfi-flash";
+                                       bank-width = <1>;
+                                       reg = <0x00000000 0x00000000 
0x00100000>;
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       status = "disabled";
+                               };
+
+                               ndfc@1,0 {
+                                       compatible = "ibm,ndfc";
+                                       reg = <00000003 00000000 00002000>;
+                                       ccr = <0x00001000>;
+                                       bank-settings = <0x80002222>;
+                                       #address-cells = <1>;
+                                       #size-cells = <1>;
+                                       status = "disabled";
+
+                                       nand {
+                                               #address-cells = <1>;
+                                               #size-cells = <1>;
+                                       };
+                               };
+                       };
+
+                       UART0: serial@ef600300 {
+                               device_type = "serial";
+                               compatible = "ns16550";
+                               reg = <0xef600300 0x00000008>;
+                               virtual-reg = <0xef600300>;
+                               clock-frequency = <0>; /* Filled in by U-Boot */
+                               current-speed = <0>; /* Filled in by U-Boot */
+                               interrupt-parent = <&UIC1>;
+                               interrupts = <0x01 IRQ_TYPE_LEVEL_HIGH>;
+                               status = "disabled";
+                       };
+
+                       UART1: serial@ef600400 {
+                               device_type = "serial";
+                               compatible = "ns16550";
+                               reg = <0xef600400 0x00000008>;
+                               virtual-reg = <0xef600400>;
+                               clock-frequency = <0>; /* Filled in by U-Boot */
+                               current-speed = <0>; /* Filled in by U-Boot */
+                               interrupt-parent = <&UIC0>;
+                               interrupts = <0x01 IRQ_TYPE_LEVEL_HIGH>;
+                               status = "disabled";
+                       };
+
+                       GPIO0: gpio@ef600b00 {
+                               compatible = "ibm,ppc4xx-gpio";
+                               reg = <0xef600b00 0x00000048>;
+                               #gpio-cells = <2>;
+                               gpio-controller;
+                               status = "disabled";
+                       };
+
+                       IIC0: i2c@ef600700 {
+                               compatible = "ibm,iic-460ex", "ibm,iic";
+                               reg = <0xef600700 0x00000014>;
+                               interrupt-parent = <&UIC0>;
+                               interrupts = <0x02 IRQ_TYPE_LEVEL_HIGH>;
+                               #address-cells = <1>;
+                               #size-cells = <0>;
+                               status = "disabled";
+                       };
+
+                       IIC1: i2c@ef600800 {
+                               compatible = "ibm,iic-460ex", "ibm,iic";
+                               reg = <0xef600800 0x00000014>;
+                               interrupt-parent = <&UIC0>;
+                               interrupts = <0x03 IRQ_TYPE_LEVEL_HIGH>;
+                               status = "disabled";
+                       };
+
+                       RGMII0: emac-rgmii@ef601500 {
+                               compatible = "ibm,rgmii-405ex", "ibm,rgmii";
+                               reg = <0xef601500 0x00000008>;
+                               has-mdio;
+                       };
+
+                       TAH0: emac-tah@ef601350 {
+                               compatible = "ibm,tah-460ex", "ibm,tah";
+                               reg = <0xef601350 0x00000030>;
+                       };
+
+                       EMAC0: ethernet@ef600c00 {
+                               device_type = "network";
+                               compatible = "ibm,emac-apm821xx", 
"ibm,emac4sync";
+                               interrupt-parent = <&EMAC0>;
+                               interrupts = <0 1>;
+                               #interrupt-cells = <1>;
+                               #address-cells = <0>;
+                               #size-cells = <0>;
+                               interrupt-map = <0 &UIC2 0x10 
IRQ_TYPE_LEVEL_HIGH /* Status */
+                                                1 &UIC2 0x14 
IRQ_TYPE_LEVEL_HIGH /* Wake */>;
+                               reg = <0xef600c00 0x000000c4>;
+                               local-mac-address = [000000000000]; /* Filled 
in by U-Boot */
+                               mal-device = <&MAL0>;
+                               mal-tx-channel = <0>;
+                               mal-rx-channel = <0>;
+                               cell-index = <0>;
+                               max-frame-size = <9000>;
+                               rx-fifo-size = <16384>;
+                               tx-fifo-size = <2048>;
+                               fifo-entry-size = <10>;
+                               phy-mode = "rgmii";
+                               phy-map = <0x00000000>;
+                               rgmii-device = <&RGMII0>;
+                               rgmii-channel = <0>;
+                               tah-device = <&TAH0>;
+                               tah-channel = <0>;
+                               has-inverted-stacr-oc;
+                               has-new-stacr-staopc;
+                               status = "disabled";
+                       };
+               };
+
+               PCIE0: pciex@d00000000 {
+                       device_type = "pci";
+                       #interrupt-cells = <1>;
+                       #size-cells = <2>;
+                       #address-cells = <3>;
+                       compatible = "ibm,plb-pciex-apm821xx", "ibm,plb-pciex";
+                       primary;
+                       port = <0x0>; /* port number */
+                       reg = <0x0000000d 0x00000000 0x20000000 /* Config space 
access */
+                              0x0000000c 0x08010000 0x00001000>;       /* 
Registers */
+                       dcr-reg = <0x100 0x020>;
+                       sdr-base = <0x300>;
+
+                       /* Outbound ranges, one memory and one IO,
+                        * later cannot be changed
+                        */
+                       ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 
0x00000000 0x00000000 0x80000000
+                                 0x02000000 0x00000000 0x00000000 0x0000000f 
0x00000000 0x00000000 0x00100000
+                                 0x01000000 0x00000000 0x00000000 0x0000000f 
0x80000000 0x00000000 0x00010000>;
+
+                       /* Inbound 2GB range starting at 0 */
+                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 
0x80000000>;
+
+                       /* This drives busses 0x40 to 0x7f */
+                       bus-range = <0x40 0x7f>;
+
+                       /* Legacy interrupts (note the weird polarity, the 
bridge seems
+                        * to invert PCIe legacy interrupts).
+                        * We are de-swizzling here because the numbers are 
actually for
+                        * port of the root complex virtual P2P bridge. But I 
want
+                        * to avoid putting a node for it in the tree, so the 
numbers
+                        * below are basically de-swizzled numbers.
+                        * The real slot is on idsel 0, so the swizzling is 1:1
+                        */
+                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
+                       interrupt-map = <
+                               0x0 0x0 0x0 0x1 &UIC3 0x0c IRQ_TYPE_LEVEL_HIGH 
/* swizzled int A */
+                               0x0 0x0 0x0 0x2 &UIC3 0x0d IRQ_TYPE_LEVEL_HIGH 
/* swizzled int B */
+                               0x0 0x0 0x0 0x3 &UIC3 0x0e IRQ_TYPE_LEVEL_HIGH 
/* swizzled int C */
+                               0x0 0x0 0x0 0x4 &UIC3 0x0f IRQ_TYPE_LEVEL_HIGH 
/* swizzled int D */>;
+                       status = "disabled";
+               };
+
+               MSI: ppc4xx-msi@C10000000 {
+                       compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
+                       reg = < 0xC 0x10000000 0x100
+                               0xC 0x10000000 0x100>;
+                       sdr-base = <0x36C>;
+                       msi-data = <0x00004440>;
+                       msi-mask = <0x0000ffe0>;
+                       interrupts =<0 1 2 3 4 5 6 7>;
+                       interrupt-parent = <&MSI>;
+                       #interrupt-cells = <1>;
+                       #address-cells = <0>;
+                       #size-cells = <0>;
+                       msi-available-ranges = <0x0 0x100>;
+                       interrupt-map = <
+                               0 &UIC3 0x18 IRQ_TYPE_EDGE_RISING
+                               1 &UIC3 0x19 IRQ_TYPE_EDGE_RISING
+                               2 &UIC3 0x1a IRQ_TYPE_EDGE_RISING
+                               3 &UIC3 0x1b IRQ_TYPE_EDGE_RISING
+                               4 &UIC3 0x1c IRQ_TYPE_EDGE_RISING
+                               5 &UIC3 0x1d IRQ_TYPE_EDGE_RISING
+                               6 &UIC3 0x1e IRQ_TYPE_EDGE_RISING
+                               7 &UIC3 0x1f IRQ_TYPE_EDGE_RISING
+                       >;
+                       status = "disabled";
+               };
+       };
+};
diff --git a/target/linux/apm821xx/dts/apollo3g-duo.dts 
b/target/linux/apm821xx/dts/apollo3g-duo.dts
index 874c469..53459b0 100644
--- a/target/linux/apm821xx/dts/apollo3g-duo.dts
+++ b/target/linux/apm821xx/dts/apollo3g-duo.dts
@@ -16,3 +16,22 @@
 / {
        model = "MyBook Live Duo";
 };
+
+&SATA0 {
+       status = "okay";
+};
+
+&USBOTG0 {
+       status = "okay";
+       dr_mode = "host";
+};
+
+&GPIO1 {
+       enable-usb {
+               status = "okay";
+       };
+
+       enable-port0 {
+               status = "okay";
+       };
+};
diff --git a/target/linux/apm821xx/dts/apollo3g.dts 
b/target/linux/apm821xx/dts/apollo3g.dts
index 1b9f826..4d31eda 100644
--- a/target/linux/apm821xx/dts/apollo3g.dts
+++ b/target/linux/apm821xx/dts/apollo3g.dts
@@ -14,21 +14,3 @@
 / {
        model = "MyBook Live";
 };
-
-&SATA0 {
-       status = "disabled";
-};
-
-&USBOTG0 {
-       status = "disabled";
-};
-
-&gpio0 {
-       enable-usb {
-               status = "disabled";
-       };
-
-       enable-port0 {
-               status = "disabled";
-       };
-};
diff --git a/target/linux/apm821xx/dts/apollo3g.dtsi 
b/target/linux/apm821xx/dts/apollo3g.dtsi
index bd15a8e..783348a 100644
--- a/target/linux/apm821xx/dts/apollo3g.dtsi
+++ b/target/linux/apm821xx/dts/apollo3g.dtsi
@@ -7,483 +7,168 @@
  * any warranty of any kind, whether express or implied.
  */
 
+#include "apm82181.dtsi"
+
 / {
-       #address-cells = <2>;
-       #size-cells = <1>;
        compatible = "amcc,apollo3g";
-       dcr-parent = <&{/cpus/cpu@0}>;
 
        aliases {
-               ethernet0 = &EMAC0;
                serial0 = &UART0;
        };
+};
 
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               cpu@0 {
-                       device_type = "cpu";
-                       model = "PowerPC,apm82181";
-                       reg = <0x00000000>;
-                       clock-frequency = <0>; /* Filled in by U-Boot */
-                       timebase-frequency = <0>; /* Filled in by U-Boot */
-                       i-cache-line-size = <32>;
-                       d-cache-line-size = <32>;
-                       i-cache-size = <32768>;
-                       d-cache-size = <32768>;
-                       dcr-controller;
-                       dcr-access-method = "native";
-                       next-level-cache = <&L2C0>;
-               };
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by 
U-Boot */
-       };
-
-       UIC0: interrupt-controller0 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <0>;
-               dcr-reg = <0x0c0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-       };
-
-       UIC1: interrupt-controller1 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <1>;
-               dcr-reg = <0x0d0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
-
-       UIC2: interrupt-controller2 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <2>;
-               dcr-reg = <0x0e0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
-
-       UIC3: interrupt-controller3 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <3>;
-               dcr-reg = <0x0f0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
-
-       OCM1: ocm@400040000 {
-               compatible = "ibm,ocm";
-               status = "okay";
-               cell-index = <1>;
-               /* configured in U-Boot */
-               reg = <4 0x00040000 0x8000>; /* 32K */
-       };
-
-       SDR0: sdr {
-               compatible = "ibm,sdr-460ex";
-               dcr-reg = <0x00e 0x002>;
-       };
+&POB0 {
+       ebc {
+               nor_flash@0,0 {
+                       status = "okay";
+                       compatible = "amd,s29gl512n", "jedec-probe", 
"cfi-flash", "mtd-rom";
+                       bank-width = <1>;
+                       reg = <0x00000000 0x00000000 0x00080000>;
+                       #address-cells = <1>;
+                       #size-cells = <1>;
 
-       CPR0: cpr {
-               compatible = "ibm,cpr-460ex";
-               dcr-reg = <0x00c 0x002>;
-       };
+                       partition@0 {
+                               /* Part of bootrom - Don't use it without a 
jump */
+                               label = "free";
+                               reg = <0x00000000 0x0001e000>;
+                       };
 
-       CPM0: cpm {
-               compatible = "ibm,cpm";
-               dcr-access-method = "native";
-               dcr-reg = <0x160 0x003>;
-               unused-units = <0x00000100>;
-               idle-doze = <0x02000000>;
-               standby = <0xfeff791d>;
-       };
+                       partition@1 {
+                               label = "env";
+                               reg = <0x0001e000 0x00002000>;
+                       };
 
-       L2C0: l2c {
-               compatible = "ibm,l2-cache-apm82181", "ibm,l2-cache";
-               dcr-reg = <0x020 0x008
-                          0x030 0x008>;
-               cache-line-size = <32>;
-               cache-size = <262144>;
-               interrupt-parent = <&UIC1>;
-               interrupts = <11 1>;
+                       partition@2 {
+                               label = "uboot";
+                               reg = <0x00020000 0x00050000>;
+                       };
+               };
        };
 
-       plb {
-               compatible = "ibm,plb-460ex", "ibm,plb4";
-               #address-cells = <2>;
-               #size-cells = <1>;
-               ranges;
-               clock-frequency = <0>; /* Filled in by U-Boot */
-
-               SDRAM0: sdram {
-                       compatible = "ibm,sdram-460ex", "ibm,sdram-405gp";
-                       dcr-reg = <0x010 0x002>;
+       GPIO1: gpio1@e0000000 {
+               compatible = "wd,mbl-gpio", "ti,74273";
+               reg-names = "dat";
+               reg = <0xe0000000 0x1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+
+               enable-phy {
+                       /* toggle to reset EMAC PHY */
+                       gpio-hog;
+                       line-name = "enable EMAC PHY";
+                       gpios = <0 GPIO_ACTIVE_LOW>;
+                       output-low;
                };
 
-               CRYPTO: crypto@180000 {
-                       compatible = "amcc,ppc460ex-crypto", 
"amcc,ppc4xx-crypto";
-                       reg = <4 0x00180000 0x80400>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <0x1d 0x4>;
+               enable-button {
+                       /* Defined in u-boot as: NOT_NOR
+                        * "enables features other than NOR
+                        * specifically, the buffer at CS2"
+                        * (button).
+                        *
+                        * Note: This option is disabled as
+                        * it prevents the system from being
+                        * rebooted successfully.
+                        */
+
+                       gpio-hog;
+                       line-name = "Enable Reset Button, disable NOR";
+                       gpios = <1 GPIO_ACTIVE_HIGH>;
+                       output-low;
                };
 
-               PKA: pka@114000 {
-                       device_type = "pka";
-                       compatible = "ppc4xx-pka", "amcc,ppc4xx-pka";
-                       reg = <0 0x00114000 0x4000>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <0x14 0x2>;
+               enable-usb {
+                       gpio-hog;
+                       line-name = "Power USB Core";
+                       gpios = <2 GPIO_ACTIVE_LOW>;
+                       output-low;
+                       status = "disabled";
                };
 
-               HWRNG: trng@110000 {
-                       compatible = "amcc,ppc460ex-rng", "ppc4xx-rng";
-                       reg = <4 0x00110000 0x50>;
+               enable-port1 {
+                       gpio-hog;
+                       line-name = "Power Drive Port 1";
+                       gpios = <3 GPIO_ACTIVE_LOW>;
+                       output-low;
                };
 
-               MAL0: mcmal {
-                       compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
-                       descriptor-memory = "ocm";
-                       dcr-reg = <0x180 0x062>;
-                       num-tx-chans = <1>;
-                       num-rx-chans = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       interrupt-parent = <&UIC2>;
-                       interrupts = <  /*TXEOB*/       0x6 0x4
-                                       /*RXEOB*/       0x7 0x4
-                                       /*SERR*/        0x3 0x4
-                                       /*TXDE*/        0x4 0x4
-                                       /*RXDE*/        0x5 0x4
-                                       /*TX0 COAL*/    0x8 0x2
-                                       /*TX1 COAL 0x9 0x2*/
-                                       /*RX0 COAL*/    0xc 0x2
-                                       /*RX1 COAL 0xd 0x2*/ >;
+               enable-port0 {
+                       gpio-hog;
+                       line-name = "Power Drive Port 0";
+                       gpios = <7 GPIO_ACTIVE_LOW>;
+                       output-low;
+                       status = "disabled";
                };
+       };
 
-               AHBDMA: dma@bffd0800 {
-                       compatible = "snps,dma-spear1340";
-                       reg = <4 0xbffd0800 0x400>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <25 4>;
-                       #dma-cells = <3>;
-                       /* use autoconfiguration for the dma setup */
-               };
+       GPIO2: gpio2@e0100000 {
+               compatible = "wd,mbl-gpio", "ti,74244";
+               reg-names = "dat";
+               reg = <0xe0100000 0x1>;
+               #gpio-cells = <2>;
+               gpio-controller;
+               no-output;
+       };
 
-               SATA0: sata@bffd1000 {
-                       compatible = "amcc,sata-460ex";
-                       reg = <4 0xbffd1000 0x800>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <26 4>;
-                       dmas = <&AHBDMA 0 0 1>;
-                       dma-names = "sata-dma";
-               };
+       gpio-leds {
+               compatible = "gpio-leds";
 
-               SATA1: sata@bffd1800 {
-                       compatible = "amcc,sata-460ex";
-                       reg = <4 0xbffd1800 0x800>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <27 4>;
-                       dmas = <&AHBDMA 1 0 2>;
-                       dma-names = "sata-dma";
+               power-red {
+                       label = "mbl:red:power";
+                       gpios = <&GPIO1 4 GPIO_ACTIVE_HIGH>;
+                       linux,default-trigger = "panic";
                };
 
-
-               USBOTG0: usbotg@bff80000 {
-                       compatible = "snps,dwc2";
-                       reg = <4 0xbff80000 0x10000>;
-                       interrupt-parent = <&USBOTG0>;
-                       interrupts = <0 1 2>;
-                       #interrupt-cells = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       interrupt-map = </* USB-OTG */ 0 &UIC2 0x1c 4
-                                        /* HIGH-POWER */ 1 &UIC1 0x1a 8
-                                        /* DMA */ 2 &UIC0 0xc 4>;
-                       dr_mode = "host";
+               power-green {
+                       label = "mbl:green:power";
+                       gpios = <&GPIO1 5 GPIO_ACTIVE_HIGH>;
                };
 
-               POB0: opb {
-                       compatible = "ibm,opb-460ex", "ibm,opb";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0xb0000000 0x4 0xb0000000 0x50000000>;
-                       clock-frequency = <0>; /* Filled in by U-Boot */
-
-                       EBC0: ebc {
-                               compatible = "ibm,ebc-460ex", "ibm,ebc";
-                               dcr-reg = <0x012 0x002>;
-                               #address-cells = <2>;
-                               #size-cells = <1>;
-                               clock-frequency = <0>; /* Filled in by U-Boot */
-                               interrupts = <0x6 0x4>;
-                               interrupt-parent = <&UIC1>;
-                               /* ranges property are supplied by U-Boot */
-                               ranges = <0x0 0x0 0xfff80000 0x00080000
-                                         0x1 0x0 0x00000000 0x00000000
-                                         0x2 0x0 0x00000000 0x00000000>;
-
-                               /* Define device tree for Apollo3g NAS NOR flash
-                                * The NOR doesn't work when "enable-button" 
GPIO
-                                * is asserted.
-                                */
-                               nor_flash@0,0 {
-                                       compatible = "amd,s29gl512n", 
"jedec-probe", "cfi-flash", "mtd-rom";
-                                       bank-width = <1>;
-                                       reg = <0x00000000 0x00000000 
0x00080000>;
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-
-                                       partition@0 {
-                                               /* Part of bootrom - Don't use 
it without a jump */
-                                               label = "free";
-                                               reg = <0x00000000 0x0001e000>;
-                                       };
-                                       partition@1 {
-                                               label = "env";
-                                               reg = <0x0001e000 0x00002000>;
-                                       };
-                                       partition@2 {
-                                               label = "uboot";
-                                               reg = <0x00020000 0x00050000>;
-                                       };
-
-                               };
-
-                               ndfc@1,0 {
-                                       compatible = "ibm,ndfc";
-                                       reg = <0x00000001 0x00000000 
0x00002000>;
-                                       ccr = <0x00001000>;
-                                       bank-settings = <0x80002222>;
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       status = "disabled";
-
-                                       nand {
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
-                                       };
-                               };
-                       };
-
-                       gpio0: gpio0@e0000000 {
-                               compatible = "wd,mbl-gpio", "ti,74273";
-                               reg-names = "dat";
-                               reg = <0xe0000000 0x1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-
-                               enable-phy {
-                                       /* toggle to reset EMAC PHY */
-                                       gpio-hog;
-                                       line-name = "enable EMAC PHY";
-                                       gpios = <0 1>;
-                                       output-low;
-                               };
-
-                               enable-button {
-                                       /* Defined in u-boot as: NOT_NOR
-                                        * "enables features other than NOR
-                                        * specifically, the buffer at CS2"
-                                        * (button).
-                                        *
-                                        * Note: This option is disabled as
-                                        * it prevents the system from being
-                                        * rebooted successfully.
-                                        */
-
-                                       gpio-hog;
-                                       line-name = "Enable Reset Button, 
disable NOR";
-                                       gpios = <1 0>;
-                                       output-low;
-                               };
-
-                               enable-usb {
-                                       gpio-hog;
-                                       line-name = "Power USB Core";
-                                       gpios = <2 1>;
-                                       output-low;
-                               };
-
-                               enable-port1 {
-                                       gpio-hog;
-                                       line-name = "Power Drive Port 1";
-                                       gpios = <3 1>;
-                                       output-low;
-                               };
-
-                               enable-port0 {
-                                       gpio-hog;
-                                       line-name = "Power Drive Port 0";
-                                       gpios = <7 1>;
-                                       output-low;
-                               };
-                       };
-
-                       gpio1: gpio1@e0100000 {
-                               compatible = "wd,mbl-gpio", "ti,74244";
-                               reg-names = "dat";
-                               reg = <0xe0100000 0x1>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               no-output;
-                       };
-
-                       UART0: serial@ef600300 {
-                               device_type = "serial";
-                               compatible = "ns16550";
-                               reg = <0xef600300 0x00000008>;
-                               virtual-reg = <0xef600300>;
-                               clock-frequency = <0>; /* Filled in by U-Boot */
-                               current-speed = <0>; /* Filled in by U-Boot */
-                               interrupt-parent = <&UIC1>;
-                               interrupts = <0x1 0x4>;
-                       };
-
-                       gpio-leds {
-                               compatible = "gpio-leds";
-                               power-red {
-                                       label = "mbl:red:power";
-                                       gpios = <&gpio0 4 0>;
-                                       linux,default-trigger = "panic";
-                               };
-                               power-green {
-                                       label = "mbl:green:power";
-                                       gpios = <&gpio0 5 0>;
-                                       linux,default-trigger = "default-on";
-                               };
-                               power-blue {
-                                       label = "mbl:blue:power";
-                                       gpios = <&gpio0 6 0>;
-                                       linux,default-trigger = "cpu0";
-                               };
-                       };
-
-                       gpio_keys_polled {
-                               compatible = "gpio-keys-polled";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               poll-interval = <60>;   /* 3 * 20 = 60ms */
-                               autorepeat;
-                               button@1 {
-                                       label = "Reset button";
-                                       linux,code = <0x198>; /* KEY_RESTART */
-                                       gpios = <&gpio1 2 1>;
-                               };
-                       };
-
-                       RGMII0: emac-rgmii@ef601500 {
-                               compatible = "ibm,rgmii-405ex", "ibm,rgmii";
-                               reg = <0xef601500 0x00000008>;
-                               has-mdio;
-                       };
+               power-blue {
+                       label = "mbl:blue:power";
+                       gpios = <&GPIO1 6 GPIO_ACTIVE_HIGH>;
+               };
+       };
 
-                       TAH0: emac-tah@ef601350 {
-                               compatible = "ibm,tah-460ex", "ibm,tah";
-                               reg = <0xef601350 0x00000030>;
-                       };
+       gpio_keys_polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <60>;   /* 3 * 20 = 60ms */
+               autorepeat;
 
-                       EMAC0: ethernet@ef600c00 {
-                               device_type = "network";
-                               compatible = "ibm,emac-405ex", "ibm,emac4sync";
-                               interrupt-parent = <&EMAC0>;
-                               interrupts = <0x0 0x1>;
-                               #interrupt-cells = <1>;
-                               #address-cells = <0>;
-                               #size-cells = <0>;
-                               interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
-                                                /*Wake*/   0x1 &UIC2 0x14 0x4>;
-                               reg = <0xef600c00 0x000000c4>;
-                               local-mac-address = [000000000000]; /* Filled 
in by U-Boot */
-                               mal-device = <&MAL0>;
-                               mal-tx-channel = <0>;
-                               mal-rx-channel = <0>;
-                               cell-index = <0>;
-                               max-frame-size = <9000>;
-                               rx-fifo-size = <16384>;
-                               tx-fifo-size = <2048>;
-                               phy-mode = "rgmii";
-                               phy-map = <0x00000000>;
-                               rgmii-device = <&RGMII0>;
-                               rgmii-channel = <0>;
-                               tah-device = <&TAH0>;
-                               tah-channel = <0>;
-                               has-inverted-stacr-oc;
-                               has-new-stacr-staopc;
-                       };
+               button@1 {
+                       label = "Reset button";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&GPIO2 2 GPIO_ACTIVE_LOW>;
                };
+       };
+};
 
-               ADMA: adma {
-                       compatible = "amcc,apm82181-adma";
-                       device_type = "dma";
-                       #address-cells = <2>;
-                       #size-cells = <1>;
+&CRYPTO {
+       status = "okay";
+};
 
-                       dma-4channel@1 {
-                               compatible = "amcc,apm82181-dma-4channel";
-                               cell-index = <1>;
-                               label = "plb_dma1";
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0xd 0x4>;
-                               pool_size = <0x4000>;
-                               dcr-reg = <0x208 0x20f>;
-                       };
+&PKA {
+       status = "okay";
+};
 
-                       dma-4channel@2 {
-                               compatible = "amcc,apm82181-dma-4channel";
-                               cell-index = <2>;
-                               label = "plb_dma2";
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0xe 0x4>;
-                               pool_size = <0x4000>;
-                               dcr-reg = <0x210 0x217>;
-                       };
+&TRNG {
+       status = "okay";
+};
 
-                       dma-4channel@3 {
-                               compatible = "amcc,apm82181-dma-4channel";
-                               cell-index = <3>;
-                               label = "plb_dma3";
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0xf 0x4>;
-                               pool_size = <0x4000>;
-                               dcr-reg = <0x218 0x21f>;
-                       };
-               };
+&SATA1 {
+       status = "okay";
+};
 
-               DMA: plb_dma@400300200 {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       compatible = "amcc,dma";
-                       cell-index = <0>;
-                       reg = <4 00300200 200>;
-                       dcr-reg = <0x100 0x13f>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <0>;
-                       interrupt-map = < /* chan0 */ 0 &UIC0 12 4>;
+&UART0 {
+       status = "okay";
+};
 
-                       dma-4channel@0{
-                               compatible = "amcc,dma-4channel";
-                               cell-index = <0>;
-                               label = "channel0";
-                               reg = <0x100 0x107>;
-                       };
-               };
-       };
+&EMAC0 {
+       status = "okay";
+};
+
+&SATA1 {
+       status = "okay";
 };
diff --git a/target/linux/apm821xx/dts/wndr4700.dts 
b/target/linux/apm821xx/dts/wndr4700.dts
index caaf05b..e0fb4e3 100644
--- a/target/linux/apm821xx/dts/wndr4700.dts
+++ b/target/linux/apm821xx/dts/wndr4700.dts
@@ -10,651 +10,17 @@
 
 /dts-v1/;
 
+#include "apm82181.dtsi"
 #include <dt-bindings/thermal/thermal.h>
 
 / {
-       #address-cells = <2>;
-       #size-cells = <1>;
        model = "Netgear WNDR4700/WNDR4720 Series";
        compatible = "netgear,wndr4700";
-       dcr-parent = <&{/cpus/cpu@0}>;
 
        aliases {
-               ethernet0 = &EMAC0;
                serial0 = &UART0;
        };
 
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               cpu0: cpu@0 {
-                       device_type = "cpu";
-                       model = "PowerPC,apm82181";
-                       reg = <0x00000000>;
-                       clock-frequency = <0>; /* Filled in by U-Boot */
-                       timebase-frequency = <0>; /* Filled in by U-Boot */
-                       i-cache-line-size = <32>;
-                       d-cache-line-size = <32>;
-                       i-cache-size = <32768>;
-                       d-cache-size = <32768>;
-                       dcr-controller;
-                       dcr-access-method = "native";
-                       next-level-cache = <&L2C0>;
-               };
-       };
-
-       memory {
-               device_type = "memory";
-               reg = <0x00000000 0x00000000 0x00000000>; /* Filled in by 
U-Boot */
-       };
-
-       UIC0: interrupt-controller0 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <0>;
-               dcr-reg = <0x0c0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-       };
-
-       UIC1: interrupt-controller1 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <1>;
-               dcr-reg = <0x0d0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0x1e 0x4 0x1f 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
-
-       UIC2: interrupt-controller2 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <2>;
-               dcr-reg = <0x0e0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0xa 0x4 0xb 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
-
-       UIC3: interrupt-controller3 {
-               compatible = "ibm,uic-460ex","ibm,uic";
-               interrupt-controller;
-               cell-index = <3>;
-               dcr-reg = <0x0f0 0x009>;
-               #address-cells = <0>;
-               #size-cells = <0>;
-               #interrupt-cells = <2>;
-               interrupts = <0x10 0x4 0x11 0x4>; /* cascade */
-               interrupt-parent = <&UIC0>;
-       };
-
-       OCM1: ocm@400040000 {
-               compatible = "ibm,ocm";
-               status = "okay";
-               cell-index = <1>;
-               /* configured in U-Boot */
-               reg = <4 0x00040000 0x8000>; /* 32K */
-       };
-
-       SDR0: sdr {
-               compatible = "ibm,sdr-460ex";
-               dcr-reg = <0x00e 0x002>;
-       };
-
-       CPR0: cpr {
-               compatible = "ibm,cpr-460ex";
-               dcr-reg = <0x00c 0x002>;
-       };
-
-       L2C0: l2c {
-               compatible = "ibm,l2-cache-apm82181", "ibm,l2-cache";
-               dcr-reg = <0x020 0x008
-                          0x030 0x008>;
-               cache-line-size = <32>;
-               cache-size = <262144>;
-               interrupt-parent = <&UIC1>;
-               interrupts = <11 1>;
-       };
-
-       CPM0: cpm {
-               compatible = "ibm,cpm-apm821xx", "ibm,cpm";
-               cell-index = <0>;
-               dcr-reg = <0x160 0x003>;
-               pm-cpu = <0x02000000>;
-               pm-doze = <0x302570F0>;
-               pm-nap = <0x302570F0>;
-               pm-deepsleep = <0x302570F0>;
-               pm-iic-device = <&IIC0>;
-               pm-emac-device = <&EMAC0>;
-       };
-
-       plb {
-               compatible = "ibm,plb-460ex", "ibm,plb4";
-               #address-cells = <2>;
-               #size-cells = <1>;
-               ranges;
-               clock-frequency = <0>; /* Filled in by U-Boot */
-
-               SDRAM0: sdram {
-                       compatible = "ibm,sdram-460ex", "ibm,sdram-405gp";
-                       dcr-reg = <0x010 0x002>;
-               };
-
-               RTC: rtc {
-                       compatible = "ibm,rtc";
-                       dcr-reg = <0x240 0x009>;
-                       interrupts = <0x1a 0x4>;
-                       interrupt-parent = <&UIC2>;
-
-               };
-
-               CRYPTO: crypto@180000 {
-                       compatible = "amcc,ppc460ex-crypto", 
"amcc,ppc4xx-crypto";
-                       reg = <4 0x00180000 0x80400>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <0x1d 0x4>;
-               };
-
-               PKA: pka@114000 {
-                       device_type = "pka";
-                       compatible = "ppc4xx-pka", "amcc,ppc4xx-pka", "amcc, 
ppc4xx-pka";
-                       reg = <4 0x00114000 0x4000>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <0x14 0x1>;
-               };
-
-               TRNG: trng@110000 {
-                       device_type = "trng";
-                       compatible = "amcc,ppc460ex-rng", "ppc4xx-rng", "amcc, 
ppc4xx-trng";
-                       reg = <4 0x00110000 0x100>;
-                       interrupt-parent = <&UIC1>;
-                       interrupts = <0x3 0x4>;
-               };
-
-               MAL0: mcmal {
-                       compatible = "ibm,mcmal-460ex", "ibm,mcmal2";
-                       descriptor-memory = "ocm";
-                       dcr-reg = <0x180 0x062>;
-                       num-tx-chans = <1>;
-                       num-rx-chans = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       interrupt-parent = <&UIC2>;
-                       interrupts = <  /*TXEOB*/ 0x6 0x4
-                                       /*RXEOB*/ 0x7 0x4
-                                       /*SERR*/  0x3 0x4
-                                       /*TXDE*/  0x4 0x4
-                                       /*RXDE*/  0x5 0x4
-                                       /*TX0 COAL*/  0x8 0x2
-                                        /*TX1 COAL  0x9 0x2*/
-                                        /*RX0 COAL*/  0xc 0x2
-                                        /*RX1 COAL  0xd 0x2*/>;
-               };
-
-               AHBDMA: dma@bffd0800 {
-                       compatible = "snps,dma-spear1340";
-                       reg = <4 0xbffd0800 0x400>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <25 4>;
-                       #dma-cells = <3>;
-                       /* use autoconfiguration for the dma setup */
-               };
-
-               SATA0: sata@bffd1000 {
-                       compatible = "amcc,sata-460ex";
-                       reg = <4 0xbffd1000 0x800>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <26 4>;
-                       dmas = <&AHBDMA 0 0 1>;
-                       dma-names = "sata-dma";
-                       status = "disabled"; /* disabled by uboot */
-               };
-
-               SATA1: sata@bffd1800 {
-                       compatible = "amcc,sata-460ex";
-                       reg = <4 0xbffd1800 0x800>;
-                       interrupt-parent = <&UIC0>;
-                       interrupts = <27 4>;
-                       dmas = <&AHBDMA 1 0 2>;
-                       dma-names = "sata-dma";
-               };
-
-               USBOTG0: usbotg@bff80000 {
-                       compatible = "netgear,wndr4700-usb";
-                       reg = <4 0xbff80000 0x10000>;
-                       interrupt-parent = <&USBOTG0>;
-                       interrupts = <0 1 2>;
-                       #interrupt-cells = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       interrupt-map = </* USB-OTG */          0 &UIC2 0x1c 4
-                                        /* HIGH-POWER */       1 &UIC1 0x1a 8
-                                        /* DMA */              2 &UIC0 0xc 4>;
-                       dr_mode = "host";
-               };
-
-               POB0: opb {
-                       compatible = "ibm,opb-460ex", "ibm,opb";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-                       ranges = <0xb0000000 0x00000004 0xb0000000 0x50000000>;
-                       clock-frequency = <0>; /* Filled in by U-Boot */
-
-                       EBC0: ebc {
-                               compatible = "ibm,ebc-460ex", "ibm,ebc";
-                               dcr-reg = <0x012 0x002>;
-                               #address-cells = <2>;
-                               #size-cells = <1>;
-                               clock-frequency = <0>; /* Filled in by U-Boot */
-                               /* ranges property is supplied by U-Boot */
-                               ranges = < 0x00000003 0x00000000 0xe0000000 
0x8000000>;
-                               interrupts = <0x6 0x4>;
-                               interrupt-parent = <&UIC1>;
-
-                               nor_flash@0,0 {
-                                       compatible = "amd,s29gl512n", 
"cfi-flash";
-                                       bank-width = <1>;
-                                       reg = <0x00000000 0x00000000 
0x00100000>;
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       status = "disabled";
-
-                                       partition@0 {
-                                               label = "back-up";
-                                               reg = <0x00000000 0x00080000>;
-                                       };
-                                       partition@1 {
-                                               label = "u-boot";
-                                               reg = <0x00080000 0x0080000>;
-                                       };
-                               };
-                               ndfc@1,0 {
-                                       compatible = "ibm,ndfc";
-                                       reg = <00000003 00000000 00002000>;
-                                       ccr = <0x00001000>;
-                                       bank-settings = <0x80002222>;
-                                       #address-cells = <1>;
-                                       #size-cells = <1>;
-                                       /*128 MiB Nand Flash*/
-                                       nand {
-                                               #address-cells = <1>;
-                                               #size-cells = <1>;
-
-                                               partition0,0@0x00000000 {
-                                                       label = "NAND 128MiB 
3,3V 8-bit";
-                                                       reg = <0x00000000 
0x08000000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,1@0x00000000 {
-                                                       label = "uboot";
-                                                       reg = <0x00000000 
0x00180000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,2@0x00180000 {
-                                                       label = "device-tree";
-                                                       reg = <0x00180000 
0x00020000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,3@0x001a0000 {
-                                                       label = "kernel";
-                                                       reg = <0x001a0000 
0x001e0000>;
-                                                       /*
-                                                        * will also contain a 
fake/empty
-                                                        * rootfs to fool 
Netgear's uboot
-                                                        * rootfs integrety 
checks.
-                                                        */
-                                               };
-
-                                               partition0,4@0x00380000 {
-                                                       label = "ubi";
-                                                       reg = <0x00380000 
0x01660000>;
-                                               };
-
-                                               partition0,5@0x019e0000 {
-                                                       label = "config";
-                                                       reg = <0x019e0000 
0x00080000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,6@0x01a60000 {
-                                                       label = "pot";
-                                                       reg = <0x01a60000 
0x00080000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,7@0x01ae0000 {
-                                                       label = "traffic_meter";
-                                                       reg = <0x01ae0000 
0x00300000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,8@0x01de0000 {
-                                                       label = "language";
-                                                       reg = <0x01de0000 
0x001c0000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,9@0x01fa0000 {
-                                                       label = "ecos";
-                                                       reg = <0x01fa0000 
0x06020000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,10@0x07fc0000 {
-                                                       label = "wifi_data";
-                                                       reg = <0x07fc0000 
0x00040000>;
-                                                       read-only;
-                                               };
-
-                                               partition0,11@0x00180000 {
-                                                       label = "firmware";
-                                                       reg = <0x00180000 
0x01860000>;
-                                                       read-only;
-                                               };
-                                       };
-                               };
-                       };
-
-                       UART0: serial@ef600300 {
-                               device_type = "serial";
-                               compatible = "ns16550";
-                               reg = <0xef600300 0x00000008>;
-                               virtual-reg = <0xef600300>;
-                               clock-frequency = <0>; /* Filled in by U-Boot */
-                               current-speed = <0>; /* Filled in by U-Boot */
-                               interrupt-parent = <&UIC1>;
-                               interrupts = <0x1 0x4>;
-                       };
-
-                       GPIO0: gpio@ef600b00 {
-                               compatible = "ibm,ppc4xx-gpio";
-                               reg = <0xef600b00 0x00000048>;
-                               #gpio-cells = <2>;
-                               gpio-controller;
-                               #interrupt-cells = <2>;
-                               interrupt-controller;
-
-                               interrupts-extended = <&UIC1 0x14>,
-                                                     <&UIC1 0x1e>,
-                                                     <&UIC1 0x1f>,
-                                                     <&UIC2 0x19>;
-                       };
-
-                       gpio_keys_polled {
-                               compatible = "gpio-keys-polled";
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-                               #interrupt-cells = <2>;
-                               autorepeat;
-                               poll-interval = <60>;   /* 3 * 20 = 60ms */
-
-                               reset {
-                                       label = "Reset button";
-                                       linux,code = <0x198>; /* KEY_RESTART */
-                                       gpios = <&GPIO0 15 0>;
-                                       interrupt-parent = <&UIC1>;
-                                       interrupts = <0x14 0x2>;
-                               };
-
-                               backup_hd {
-                                       label = "Backup HD button";
-                                       gpios = <&GPIO0 19 0>;
-                                       linux,code = <0x100>; /* BTN_0 */
-                                       interrupt-parent = <&UIC1>;
-                                       interrupts = <0x1e 0x2>;
-                               };
-
-                               rfkill {
-                                       label = "RFKILL button";
-                                       gpios = <&GPIO0 20 0>;
-                                       linux,code = <0xf7>; /* KEY_RFKILL */
-                                       interrupt-parent = <&UIC1>;
-                                       interrupts = <0x1f 0x2>;
-                               };
-
-                               wps {
-                                       label = "WPS button";
-                                       gpios = <&GPIO0 23 0>;
-                                       linux,code = <0x211>; /* KEY_WPS_BUTTON 
*/
-                                       interrupt-parent = <&UIC2>;
-                                       interrupts = <0x19 0x2>;
-                               };
-
-                               sdcard {
-                                       label = "SDCard inserted";
-                                       gpios = <&GPIO0 7 1>;
-                                       linux,code = <0x101>; /* BTN_1 */
-                               };
-                       };
-
-                       gpio-leds {
-                               compatible = "gpio-leds";
-                               power-green {
-                                       label = "wndr4700:green:power";
-                                       gpios = <&GPIO0 8 0>;
-                               };
-
-                               power-orange {
-                                       label = "wndr4700:orange:power";
-                                       gpios = <&GPIO0 9 1>;
-                                       linux,default-trigger = "panic";
-                               };
-
-                               usb-blue {
-                                       label = "wndr4700:blue:usb";
-                                       gpios = <&GPIO0 10 0>;
-                               };
-
-                               logo-white {
-                                       label = "wndr4700:white:logo";
-                                       gpios = <&GPIO0 11 0>;
-                               };
-
-                               wan-yellow {
-                                       label = "wndr4700:yellow:wan";
-                                       gpios = <&GPIO0 3 0>;
-                               };
-
-                               wan-green {
-                                       label = "wndr4700:green:wan";
-                                       gpios = <&GPIO0 12 0>;
-                               };
-
-                               hd-green {
-                                       label = "wndr4700:green:hd";
-                                       gpios = <&GPIO0 14 0>;
-                               };
-
-                               hd-red {
-                                       label = "wndr4700:red:hd";
-                                       gpios = <&GPIO0 17 0>;
-                               };
-
-                               wlan-blue {
-                                       label = "wndr4700:blue:wlan";
-                                       gpios = <&GPIO0 18 0>;
-                               };
-                       };
-
-                       IIC0: i2c@ef600700 {
-                               compatible = "ibm,iic-460ex", "ibm,iic";
-                               reg = <0xef600700 0x00000014>;
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0x2 0x4>;
-                               #address-cells = <1>;
-                               #size-cells = <0>;
-
-                               fan0: fan@1b {
-                                       compatible = "microchip,tc654";
-                                       reg = <0x1b>;
-                                       cooling-min-level = <0>;
-                                       cooling-max-level = <255>;
-                                       #cooling-cells = <2>; /* min followed 
by max */
-
-                                       gpios = <&GPIO0 16 1>; /* fan status */
-                                       alarm-gpios = <&GPIO0 5 1>; /* fault */
-                                       interrupt-parent = <&UIC3>;
-                                       interrupts = <0x16 0x2>; /* fault */
-                               };
-
-                               temp0: temp@4d {
-                                       compatible = "gmt,g781";
-                                       reg = <0x4d>;
-                                       #thermal-sensor-cells = <1>;
-
-                                       /*
-                                        * The LM90 has two sensors:
-                                        *   temp0 -> internal to LM90
-                                        *   temp1 -> external NTC near CPU
-                                        */
-                               };
-                       };
-
-                       IIC1: i2c@ef600800 {
-                               compatible = "ibm,iic-460ex", "ibm,iic";
-                               reg = <0xef600800 0x00000014>;
-                               interrupt-parent = <&UIC0>;
-                               interrupts = <0x3 0x4>;
-                       };
-
-                       RGMII0: emac-rgmii@ef601500 {
-                               compatible = "ibm,rgmii-405ex", "ibm,rgmii";
-                               reg = <0xef601500 0x00000008>;
-                               has-mdio;
-                       };
-
-                       TAH0: emac-tah@ef601350 {
-                               compatible = "ibm,tah-460ex", "ibm,tah";
-                               reg = <0xef601350 0x00000030>;
-                       };
-
-                       EMAC0: ethernet@ef600c00 {
-                               device_type = "network";
-                               compatible = "ibm,emac-apm821xx", 
"ibm,emac4sync";
-                               interrupt-parent = <&EMAC0>;
-                               interrupts = <0x0 0x1>;
-                               #interrupt-cells = <1>;
-                               #address-cells = <0>;
-                               #size-cells = <0>;
-                               interrupt-map = </*Status*/ 0x0 &UIC2 0x10 0x4
-                                                /*Wake*/   0x1 &UIC2 0x14 0x4>;
-                               reg = <0xef600c00 0x000000c4>;
-                               local-mac-address = [000000000000]; /* Filled 
in by U-Boot */
-                               mal-device = <&MAL0>;
-                               mal-tx-channel = <0>;
-                               mal-rx-channel = <0>;
-                               cell-index = <0>;
-                               max-frame-size = <9000>;
-                               rx-fifo-size = <16384>;
-                               tx-fifo-size = <2048>;
-                               fifo-entry-size = <10>;
-                               phy-mode = "rgmii";
-                               phy-handle = <&phy0>;
-                               phy-map = <0x00000000>;
-                               rgmii-device = <&RGMII0>;
-                               rgmii-channel = <0>;
-                               tah-device = <&TAH0>;
-                               tah-channel = <0>;
-                               has-inverted-stacr-oc;
-                               has-new-stacr-staopc;
-
-                               mdio {
-                                       #address-cells = <1>;
-                                       #size-cells = <0>;
-
-                                       phy0: ethernet-phy@0 {
-                                               device_type = "ethernet-phy";
-                                               reg = <0>;
-                                               qca,ar8327-initvals = <
-                                                       0x0010 0x40000000
-                                                       0x0624 0x007f7f7f
-                                                       0x0004 0x07a00000       
/* PAD0_MODE */
-                                                       0x000c 0x01000000       
/* PAD6_MODE */
-                                                       0x007c 0x0000007e       
/* PORT0_STATUS */
-                                               >;
-                                       };
-                               };
-                       };
-               };
-
-               PCIE0: pciex@d00000000 {
-                       device_type = "pci";
-                       #interrupt-cells = <1>;
-                       #size-cells = <2>;
-                       #address-cells = <3>;
-                       compatible = "ibm,plb-pciex-apm821xx", "ibm,plb-pciex";
-                       primary;
-                       port = <0x0>; /* port number */
-                       reg = <0x0000000d 0x00000000 0x20000000 /* Config space 
access */
-                              0x0000000c 0x08010000 0x00001000>;       /* 
Registers */
-                       dcr-reg = <0x100 0x020>;
-                       sdr-base = <0x300>;
-
-                       /* Outbound ranges, one memory and one IO,
-                        * later cannot be changed
-                        */
-                       ranges = <0x02000000 0x00000000 0x80000000 0x0000000e 
0x00000000 0x00000000 0x80000000
-                                 0x02000000 0x00000000 0x00000000 0x0000000f 
0x00000000 0x00000000 0x00100000
-                                 0x01000000 0x00000000 0x00000000 0x0000000f 
0x80000000 0x00000000 0x00010000>;
-
-                       /* Inbound 2GB range starting at 0 */
-                       dma-ranges = <0x42000000 0x0 0x0 0x0 0x0 0x0 
0x80000000>;
-
-                       /* This drives busses 40 to 0x7f */
-                       bus-range = <0x40 0x7f>;
-
-                       /* Legacy interrupts (note the weird polarity, the 
bridge seems
-                        * to invert PCIe legacy interrupts).
-                        * We are de-swizzling here because the numbers are 
actually for
-                        * port of the root complex virtual P2P bridge. But I 
want
-                        * to avoid putting a node for it in the tree, so the 
numbers
-                        * below are basically de-swizzled numbers.
-                        * The real slot is on idsel 0, so the swizzling is 1:1
-                        */
-                       interrupt-map-mask = <0x0 0x0 0x0 0x7>;
-                       interrupt-map = <
-                               0x0 0x0 0x0 0x1 &UIC3 0xc 0x4 /* swizzled int A 
*/
-                               0x0 0x0 0x0 0x2 &UIC3 0xd 0x4 /* swizzled int B 
*/
-                               0x0 0x0 0x0 0x3 &UIC3 0xe 0x4 /* swizzled int C 
*/
-                               0x0 0x0 0x0 0x4 &UIC3 0xf 0x4 /* swizzled int D 
*/>;
-               };
-
-               MSI: ppc4xx-msi@C10000000 {
-                       compatible = "amcc,ppc4xx-msi", "ppc4xx-msi";
-                       reg = < 0xC 0x10000000 0x100
-                               0xC 0x10000000 0x100>;
-                       sdr-base = <0x36C>;
-                       msi-data = <0x00004440>;
-                       msi-mask = <0x0000ffe0>;
-                       interrupts =<0 1 2 3 4 5 6 7>;
-                       interrupt-parent = <&MSI>;
-                       #interrupt-cells = <1>;
-                       #address-cells = <0>;
-                       #size-cells = <0>;
-                       msi-available-ranges = <0x0 0x100>;
-                       interrupt-map = <
-                               0 &UIC3 0x18 1
-                               1 &UIC3 0x19 1
-                               2 &UIC3 0x1A 1
-                               3 &UIC3 0x1B 1
-                               4 &UIC3 0x1C 1
-                               5 &UIC3 0x1D 1
-                               6 &UIC3 0x1E 1
-                               7 &UIC3 0x1F 1
-                       >;
-               };
-       };
-
        chosen {
                linux,stdout-path = "/plb/opb/serial@ef600300";
        };
@@ -760,3 +126,281 @@
                };
        };
 };
+
+&CRYPTO {
+       status = "okay";
+};
+
+&PKA {
+       status = "okay";
+};
+
+&TRNG {
+       status = "okay";
+};
+
+&SATA1 {
+       status = "okay";
+};
+
+&USBOTG0 {
+       status = "okay";
+       dr_mode = "host";
+};
+
+&EBC0 {
+       ndfc@1,0 {
+               status = "okay";
+               /* 128 MiB Nand Flash */
+               nand {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition0,0@0x00000000 {
+                               label = "NAND 128MiB 3,3V 8-bit";
+                               reg = <0x00000000 0x08000000>;
+                               read-only;
+                       };
+
+                       partition0,1@0x00000000 {
+                               label = "uboot";
+                               reg = <0x00000000 0x00180000>;
+                               read-only;
+                       };
+
+                       partition0,2@0x00180000 {
+                               label = "device-tree";
+                               reg = <0x00180000 0x00020000>;
+                               read-only;
+                       };
+
+                       partition0,3@0x001a0000 {
+                               label = "kernel";
+                               reg = <0x001a0000 0x001e0000>;
+                               /*
+                                * will also contain a fake/empty
+                                * rootfs to fool Netgear's uboot
+                                * rootfs integrety checks.
+                                */
+                       };
+
+                       partition0,4@0x00380000 {
+                               label = "ubi";
+                               reg = <0x00380000 0x01660000>;
+                       };
+
+                       partition0,5@0x019e0000 {
+                               label = "config";
+                               reg = <0x019e0000 0x00080000>;
+                               read-only;
+                       };
+
+                       partition0,6@0x01a60000 {
+                               label = "pot";
+                               reg = <0x01a60000 0x00080000>;
+                               read-only;
+                       };
+
+                       partition0,7@0x01ae0000 {
+                               label = "traffic_meter";
+                               reg = <0x01ae0000 0x00300000>;
+                               read-only;
+                       };
+
+                       partition0,8@0x01de0000 {
+                               label = "language";
+                               reg = <0x01de0000 0x001c0000>;
+                               read-only;
+                       };
+
+                       partition0,9@0x01fa0000 {
+                               label = "ecos";
+                               reg = <0x01fa0000 0x06020000>;
+                               read-only;
+                       };
+
+                       partition0,10@0x07fc0000 {
+                               label = "wifi_data";
+                               reg = <0x07fc0000 0x00040000>;
+                               read-only;
+                       };
+
+                       partition0,11@0x00180000 {
+                               label = "firmware";
+                               reg = <0x00180000 0x01860000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&UART0 {
+       status = "okay";
+};
+
+&GPIO0 {
+       status = "okay";
+       #interrupt-cells = <2>;
+       interrupt-controller;
+       interrupts-extended = <&UIC1 0x14>,
+                             <&UIC1 0x1e>,
+                             <&UIC1 0x1f>,
+                             <&UIC2 0x19>;
+};
+
+&IIC0 {
+       status = "okay";
+
+       fan0: fan@1b {
+               compatible = "microchip,tc654";
+               reg = <0x1b>;
+               cooling-min-level = <0>;
+               cooling-max-level = <255>;
+               #cooling-cells = <2>; /* min followed by max */
+
+               gpios = <&GPIO0 16 GPIO_ACTIVE_LOW>; /* fan status */
+               alarm-gpios = <&GPIO0 5 GPIO_ACTIVE_LOW>; /* fault */
+               interrupt-parent = <&UIC3>;
+               interrupts = <0x16 IRQ_TYPE_EDGE_FALLING>; /* fault */
+       };
+
+       temp0: temp@4d {
+               compatible = "gmt,g781";
+               reg = <0x4d>;
+               #thermal-sensor-cells = <1>;
+
+               /*
+                * The LM90 has two sensors:
+                *   temp0 -> internal to LM90
+                *   temp1 -> external NTC near CPU
+                */
+       };
+};
+
+
+&EMAC0 {
+       status = "okay";
+       phy-handle = <&phy0>;
+
+       mdio {
+               #address-cells = <1>;
+               #size-cells = <0>;
+               phy0: ethernet-phy@0 {
+                       device_type = "ethernet-phy";
+                       reg = <0>;
+                       qca,ar8327-initvals = <
+                               0x0010 0x40000000
+                               0x0624 0x007f7f7f
+                               0x0004 0x07a00000       /* PAD0_MODE */
+                               0x000c 0x01000000       /* PAD6_MODE */
+                               0x007c 0x0000007e       /* PORT0_STATUS */
+                       >;
+               };
+       };
+};
+
+&POB0 {
+       gpio_keys_polled {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               #interrupt-cells = <2>;
+               autorepeat;
+               poll-interval = <60>;   /* 3 * 20 = 60ms */
+
+               reset {
+                       label = "Reset button";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&GPIO0 15 GPIO_ACTIVE_HIGH>;
+                       interrupt-parent = <&UIC1>;
+                       interrupts = <0x14 IRQ_TYPE_EDGE_FALLING>;
+               };
+
+               backup_hd {
+                       label = "Backup HD button";
+                       gpios = <&GPIO0 19 GPIO_ACTIVE_HIGH>;
+                       linux,code = <BTN_0>;
+                       interrupt-parent = <&UIC1>;
+                       interrupts = <0x1e IRQ_TYPE_EDGE_FALLING>;
+               };
+
+               rfkill {
+                       label = "RFKILL button";
+                       gpios = <&GPIO0 20 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_RFKILL>;
+                       interrupt-parent = <&UIC1>;
+                       interrupts = <0x1f IRQ_TYPE_EDGE_FALLING>;
+               };
+
+               wps {
+                       label = "WPS button";
+                       gpios = <&GPIO0 23 GPIO_ACTIVE_HIGH>;
+                       linux,code = <KEY_WPS_BUTTON>;
+                       interrupt-parent = <&UIC2>;
+                       interrupts = <0x19 IRQ_TYPE_EDGE_FALLING>;
+               };
+
+               sdcard {
+                       label = "SDCard inserted";
+                       gpios = <&GPIO0 7 GPIO_ACTIVE_LOW>;
+                       linux,code = <BTN_1>;
+               };
+       };
+
+       gpio-leds {
+               compatible = "gpio-leds";
+               power-green {
+                       label = "wndr4700:green:power";
+                       gpios = <&GPIO0 8 GPIO_ACTIVE_HIGH>;
+               };
+
+               power-orange {
+                       label = "wndr4700:orange:power";
+                       gpios = <&GPIO0 9 GPIO_ACTIVE_LOW>;
+                       linux,default-trigger = "panic";
+               };
+
+               usb-blue {
+                       label = "wndr4700:blue:usb";
+                       gpios = <&GPIO0 10 GPIO_ACTIVE_HIGH>;
+               };
+
+               logo-white {
+                       label = "wndr4700:white:logo";
+                       gpios = <&GPIO0 11 GPIO_ACTIVE_HIGH>;
+               };
+
+               wan-yellow {
+                       label = "wndr4700:yellow:wan";
+                       gpios = <&GPIO0 3 GPIO_ACTIVE_HIGH>;
+               };
+
+               wan-green {
+                       label = "wndr4700:green:wan";
+                       gpios = <&GPIO0 12 GPIO_ACTIVE_HIGH>;
+               };
+
+               hd-green {
+                       label = "wndr4700:green:hd";
+                       gpios = <&GPIO0 14 GPIO_ACTIVE_HIGH>;
+               };
+
+               hd-red {
+                       label = "wndr4700:red:hd";
+                       gpios = <&GPIO0 17 GPIO_ACTIVE_HIGH>;
+               };
+
+               wlan-blue {
+                       label = "wndr4700:blue:wlan";
+                       gpios = <&GPIO0 18 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&PCIE0 {
+       status = "okay";
+};
+
+&MSI {
+       status = "okay";
+};
-- 
2.10.2


_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev

Reply via email to