apm821xx: dts: rename devices dts files to include the manufacturer
authorChristian Lamparter <chunkeey@gmail.com>
Sun, 17 Dec 2017 13:59:58 +0000 (14:59 +0100)
committerMathias Kresin <dev@kresin.me>
Thu, 21 Dec 2017 00:05:16 +0000 (01:05 +0100)
This patch rename all the DT source files in order to
match upstream's "manufacturer-device.dts" format.

Please note that the DEVICE_DTB isn't changed. This is
because the u-boot of the MyBook Live defines the
fdt_file variable to be "apollo3g/apollo3g.dtb".

Signed-off-by: Christian Lamparter <chunkeey@gmail.com>
target/linux/apm821xx/dts/MR24.dts [deleted file]
target/linux/apm821xx/dts/MX60.dts [deleted file]
target/linux/apm821xx/dts/apollo3g-duo.dts [deleted file]
target/linux/apm821xx/dts/apollo3g.dts [deleted file]
target/linux/apm821xx/dts/meraki-mr24.dts [new file with mode: 0644]
target/linux/apm821xx/dts/meraki-mx60.dts [new file with mode: 0644]
target/linux/apm821xx/dts/netgear-wndr4700.dts [new file with mode: 0644]
target/linux/apm821xx/dts/wd-mybooklive-duo.dts [new file with mode: 0644]
target/linux/apm821xx/dts/wd-mybooklive.dts [new file with mode: 0644]
target/linux/apm821xx/dts/wndr4700.dts [deleted file]
target/linux/apm821xx/image/Makefile

diff --git a/target/linux/apm821xx/dts/MR24.dts b/target/linux/apm821xx/dts/MR24.dts
deleted file mode 100644 (file)
index 2c2f8d2..0000000
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Device Tree Source for Meraki MR24 (Ikarem)
- *
- * Copyright (C) 2016 Chris Blake <chrisrblake93@gmail.com>
- *
- * Based on Cisco Meraki GPL Release r23-20150601 MR24 DTS
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without
- * any warranty of any kind, whether express or implied.
- */
-
-/dts-v1/;
-
-#include "apm82181.dtsi"
-
-/ {
-       model = "Meraki MR24 Access Point";
-       compatible = "meraki,mr24", "meraki,ikarem", "apm,bluestone";
-
-       aliases {
-               serial0 = &UART1;
-               led-boot = &status;
-               led-failsafe = &failsafe;
-               led-running = &status;
-               led-upgrade = &status;
-       };
-
-       chosen {
-               linux,stdout-path = "/plb/opb/serial@ef600400";
-       };
-
-};
-
-
-&CRYPTO {
-       status = "okay";
-};
-
-&PKA {
-       status = "okay";
-};
-
-&TRNG {
-       status = "okay";
-};
-
-&EBC0 {
-       /* Ikarem has 32MB of NAND */
-       ndfc@1,0 {
-               status = "okay";
-               /* 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>;
-                       };
-               };
-       };
-};
-
-&UART1 {
-       status = "okay";
-};
-
-&GPIO0 {
-       status = "okay";
-};
-
-&IIC0 {
-       status = "okay";
-       /* Boot ROM is at 0x52-0x53, do not touch */
-       /* Unknown chip at 0x6e, not sure what it is */
-};
-
-&EMAC0 {
-       status = "okay";
-};
-
-&POB0 {
-       gpio-leds {
-               compatible = "gpio-leds";
-
-               status: power-green {
-                       label = "mr24:green:power";
-                       gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
-               };
-
-               failsafe: power-orange {
-                       label = "mr24:orange:power";
-                       gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
-               };
-
-               lan {
-                       label = "mr24:green:wan";
-                       gpios = <&GPIO0 17 GPIO_ACTIVE_LOW>;
-               };
-
-               ssi-0 {
-                       label = "mr24:green:wifi1";
-                       gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
-               };
-
-               ssi-1 {
-                       label = "mr24:green:wifi2";
-                       gpios = <&GPIO0 22 GPIO_ACTIVE_LOW>;
-               };
-
-               ssi-2 {
-                       label = "mr24:green:wifi3";
-                       gpios = <&GPIO0 21 GPIO_ACTIVE_LOW>;
-               };
-
-               ssi-3 {
-                       label = "mr24:green:wifi4";
-                       gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       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/MX60.dts b/target/linux/apm821xx/dts/MX60.dts
deleted file mode 100644 (file)
index 32e5c85..0000000
+++ /dev/null
@@ -1,190 +0,0 @@
-/*
- * Device Tree Source for Meraki MX60/MX60W (Buckminster)
- *
- * Copyright (C) 2016 Chris Blake <chrisrblake93@gmail.com>
- *
- * Based on Cisco Meraki DTS extracted from release wired-12-217818
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without
- * any warranty of any kind, whether express or implied.
- */
-
-/dts-v1/;
-
-#include "apm82181.dtsi"
-
-/ {
-       model = "Meraki MX60/MX60W Security Appliance";
-       compatible = "meraki,mx60", "meraki,buckminster", "apm,bluestone";
-
-       aliases {
-               serial0 = &UART1;
-               led-boot = &status;
-               led-failsafe = &failsafe;
-               led-running = &status;
-               led-upgrade = &status;
-       };
-
-       chosen {
-               linux,stdout-path = "/plb/opb/serial@ef600400";
-       };
-
-};
-
-&CRYPTO {
-       status = "okay";
-};
-
-&PKA {
-       status = "okay";
-};
-
-&TRNG {
-       status = "okay";
-};
-
-&USBOTG0 {
-       status = "okay";
-       dr_mode = "host";
-};
-
-&EBC0 {
-       /* Buckminster has 1GiB of NAND */
-       ndfc@1,0 {
-               status = "okay";
-               nand {
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x00000000 0x00100000>;
-                               read-only;
-                       };
-
-                       partition@100000 {
-                               label = "u-boot-env";
-                               reg = <0x00100000 0x00100000>;
-                               read-only;
-                       };
-
-                       partition@200000 {
-                               label = "oops";
-                               reg = <0x00200000 0x00040000>;
-                       };
-
-                       partition@240000 {
-                               label = "ubi";
-                               reg = <0x00240000 0x3fdc0000>;
-                       };
-
-                       all {
-                               label = "all";
-                               reg = <0x00000000 0x40000000>;
-                       };
-               };
-       };
-};
-
-&UART1 {
-       status = "okay";
-};
-
-&GPIO0 {
-       status = "okay";
-};
-
-&IIC0 {
-       status = "okay";
-};
-
-&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-leds {
-               compatible = "gpio-leds";
-
-               status: power-green {
-                       label = "mx60:green:power";
-                       gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
-               };
-
-               failsafe: power-orange {
-                       label = "mx60:orange:power";
-                       gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
-               };
-
-               wan-green {
-                       label = "mx60:green:wan";
-                       gpios = <&GPIO0 17 GPIO_ACTIVE_LOW>;
-               };
-
-               wan-orange {
-                       label = "mx60:orange:wan";
-                       gpios = <&GPIO0 15 GPIO_ACTIVE_LOW>;
-               };
-
-               lan1 {
-                       label = "mx60:green:lan1";
-                       gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
-               };
-
-               lan2 {
-                       label = "mx60:green:lan2";
-                       gpios = <&GPIO0 21 GPIO_ACTIVE_LOW>;
-               };
-
-               lan3 {
-                       label = "mx60:green:lan3";
-                       gpios = <&GPIO0 22 GPIO_ACTIVE_LOW>;
-               };
-
-               lan4 {
-                       label = "mx60:green:lan4";
-                       gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       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 {
-       /* Leave this enabled as u-boot on the MX60 will disable it for us */
-       status = "okay";
-};
-
-&MSI {
-       status = "okay";
-};
diff --git a/target/linux/apm821xx/dts/apollo3g-duo.dts b/target/linux/apm821xx/dts/apollo3g-duo.dts
deleted file mode 100644 (file)
index 4f6cc50..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Device Tree Source for AMCC Canyonlands (460EX)
- *
- * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
- * (c) Copyright 2010 Western Digital Technologies, Inc. All Rights Reserved.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without
- * any warranty of any kind, whether express or implied.
- */
-
-/dts-v1/;
-
-#include "apollo3g.dtsi"
-
-/ {
-       compatible = "wd,mybooklive-duo", "amcc,apollo3g";
-       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
deleted file mode 100644 (file)
index d841352..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
- * (c) Copyright 2010 Western Digital Technologies, Inc. All Rights Reserved.
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without
- * any warranty of any kind, whether express or implied.
- */
-
-/dts-v1/;
-
-#include "apollo3g.dtsi"
-
-/ {
-       compatible = "wd,mybooklive", "amcc,apollo3g";
-       model = "MyBook Live";
-};
diff --git a/target/linux/apm821xx/dts/meraki-mr24.dts b/target/linux/apm821xx/dts/meraki-mr24.dts
new file mode 100644 (file)
index 0000000..2c2f8d2
--- /dev/null
@@ -0,0 +1,155 @@
+/*
+ * Device Tree Source for Meraki MR24 (Ikarem)
+ *
+ * Copyright (C) 2016 Chris Blake <chrisrblake93@gmail.com>
+ *
+ * Based on Cisco Meraki GPL Release r23-20150601 MR24 DTS
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "apm82181.dtsi"
+
+/ {
+       model = "Meraki MR24 Access Point";
+       compatible = "meraki,mr24", "meraki,ikarem", "apm,bluestone";
+
+       aliases {
+               serial0 = &UART1;
+               led-boot = &status;
+               led-failsafe = &failsafe;
+               led-running = &status;
+               led-upgrade = &status;
+       };
+
+       chosen {
+               linux,stdout-path = "/plb/opb/serial@ef600400";
+       };
+
+};
+
+
+&CRYPTO {
+       status = "okay";
+};
+
+&PKA {
+       status = "okay";
+};
+
+&TRNG {
+       status = "okay";
+};
+
+&EBC0 {
+       /* Ikarem has 32MB of NAND */
+       ndfc@1,0 {
+               status = "okay";
+               /* 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>;
+                       };
+               };
+       };
+};
+
+&UART1 {
+       status = "okay";
+};
+
+&GPIO0 {
+       status = "okay";
+};
+
+&IIC0 {
+       status = "okay";
+       /* Boot ROM is at 0x52-0x53, do not touch */
+       /* Unknown chip at 0x6e, not sure what it is */
+};
+
+&EMAC0 {
+       status = "okay";
+};
+
+&POB0 {
+       gpio-leds {
+               compatible = "gpio-leds";
+
+               status: power-green {
+                       label = "mr24:green:power";
+                       gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
+               };
+
+               failsafe: power-orange {
+                       label = "mr24:orange:power";
+                       gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
+               };
+
+               lan {
+                       label = "mr24:green:wan";
+                       gpios = <&GPIO0 17 GPIO_ACTIVE_LOW>;
+               };
+
+               ssi-0 {
+                       label = "mr24:green:wifi1";
+                       gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
+               };
+
+               ssi-1 {
+                       label = "mr24:green:wifi2";
+                       gpios = <&GPIO0 22 GPIO_ACTIVE_LOW>;
+               };
+
+               ssi-2 {
+                       label = "mr24:green:wifi3";
+                       gpios = <&GPIO0 21 GPIO_ACTIVE_LOW>;
+               };
+
+               ssi-3 {
+                       label = "mr24:green:wifi4";
+                       gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       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/meraki-mx60.dts b/target/linux/apm821xx/dts/meraki-mx60.dts
new file mode 100644 (file)
index 0000000..32e5c85
--- /dev/null
@@ -0,0 +1,190 @@
+/*
+ * Device Tree Source for Meraki MX60/MX60W (Buckminster)
+ *
+ * Copyright (C) 2016 Chris Blake <chrisrblake93@gmail.com>
+ *
+ * Based on Cisco Meraki DTS extracted from release wired-12-217818
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "apm82181.dtsi"
+
+/ {
+       model = "Meraki MX60/MX60W Security Appliance";
+       compatible = "meraki,mx60", "meraki,buckminster", "apm,bluestone";
+
+       aliases {
+               serial0 = &UART1;
+               led-boot = &status;
+               led-failsafe = &failsafe;
+               led-running = &status;
+               led-upgrade = &status;
+       };
+
+       chosen {
+               linux,stdout-path = "/plb/opb/serial@ef600400";
+       };
+
+};
+
+&CRYPTO {
+       status = "okay";
+};
+
+&PKA {
+       status = "okay";
+};
+
+&TRNG {
+       status = "okay";
+};
+
+&USBOTG0 {
+       status = "okay";
+       dr_mode = "host";
+};
+
+&EBC0 {
+       /* Buckminster has 1GiB of NAND */
+       ndfc@1,0 {
+               status = "okay";
+               nand {
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x00000000 0x00100000>;
+                               read-only;
+                       };
+
+                       partition@100000 {
+                               label = "u-boot-env";
+                               reg = <0x00100000 0x00100000>;
+                               read-only;
+                       };
+
+                       partition@200000 {
+                               label = "oops";
+                               reg = <0x00200000 0x00040000>;
+                       };
+
+                       partition@240000 {
+                               label = "ubi";
+                               reg = <0x00240000 0x3fdc0000>;
+                       };
+
+                       all {
+                               label = "all";
+                               reg = <0x00000000 0x40000000>;
+                       };
+               };
+       };
+};
+
+&UART1 {
+       status = "okay";
+};
+
+&GPIO0 {
+       status = "okay";
+};
+
+&IIC0 {
+       status = "okay";
+};
+
+&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-leds {
+               compatible = "gpio-leds";
+
+               status: power-green {
+                       label = "mx60:green:power";
+                       gpios = <&GPIO0 18 GPIO_ACTIVE_LOW>;
+               };
+
+               failsafe: power-orange {
+                       label = "mx60:orange:power";
+                       gpios = <&GPIO0 19 GPIO_ACTIVE_LOW>;
+               };
+
+               wan-green {
+                       label = "mx60:green:wan";
+                       gpios = <&GPIO0 17 GPIO_ACTIVE_LOW>;
+               };
+
+               wan-orange {
+                       label = "mx60:orange:wan";
+                       gpios = <&GPIO0 15 GPIO_ACTIVE_LOW>;
+               };
+
+               lan1 {
+                       label = "mx60:green:lan1";
+                       gpios = <&GPIO0 20 GPIO_ACTIVE_LOW>;
+               };
+
+               lan2 {
+                       label = "mx60:green:lan2";
+                       gpios = <&GPIO0 21 GPIO_ACTIVE_LOW>;
+               };
+
+               lan3 {
+                       label = "mx60:green:lan3";
+                       gpios = <&GPIO0 22 GPIO_ACTIVE_LOW>;
+               };
+
+               lan4 {
+                       label = "mx60:green:lan4";
+                       gpios = <&GPIO0 23 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       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 {
+       /* Leave this enabled as u-boot on the MX60 will disable it for us */
+       status = "okay";
+};
+
+&MSI {
+       status = "okay";
+};
diff --git a/target/linux/apm821xx/dts/netgear-wndr4700.dts b/target/linux/apm821xx/dts/netgear-wndr4700.dts
new file mode 100644 (file)
index 0000000..2e0addf
--- /dev/null
@@ -0,0 +1,409 @@
+/*
+ * Device Tree Source for Netgear WNDR4700/WNDR4720 Series
+ *
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "apm82181.dtsi"
+#include <dt-bindings/thermal/thermal.h>
+
+/ {
+       model = "Netgear WNDR4700/WNDR4720 Series";
+       compatible = "netgear,wndr4700";
+
+       aliases {
+               serial0 = &UART0;
+               led-boot = &status;
+               led-failsafe = &failsafe;
+               led-running = &status;
+               led-upgrade = &status;
+       };
+
+       chosen {
+               linux,stdout-path = "/plb/opb/serial@ef600300";
+       };
+
+       thermal-zones {
+               cpu_thermal: cpu-thermal {
+                       polling-delay-passive = <10000>; /* milliseconds */
+                       polling-delay = <20000>; /* milliseconds */
+
+                       thermal-sensors = <&temp0 1>;
+
+                       trips {
+                               /*
+                                * Once the thermal governers are a bit smarter
+                                * and do hysteresis properly, we can disable
+                                * the fan when the HDD and CPU has < 39 C.
+                                */
+                               cpu_alert0: cpu-alert0 {
+                                       temperature = <25000>;
+                                       hysteresis = <2000>;
+                                       type = "active";
+                               };
+
+                               cpu_alert1: cpu-alert1 {
+                                       temperature = <27000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "active";
+                               };
+
+                               cpu_alert2: cpu-alert2 {
+                                       temperature = <65000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "active";
+                               };
+
+                               cpu_alert3: cpu-alert3 {
+                                       temperature = <70000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "active";
+                               };
+
+                               cpu_alert4: cpu-alert4 {
+                                       temperature = <75000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "active";
+                               };
+
+                               cpu_alert5: cpu-alert5 {
+                                       temperature = <80000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "active";
+                               };
+
+                               cpu_alert6: cpu-alert6 {
+                                       temperature = <850000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "active";
+                               };
+
+                               cpu_crit: cpu-crit {
+                                       temperature = <90000>; /* millicelsius */
+                                       hysteresis = <2000>; /* millicelsius */
+                                       type = "critical";
+                               };
+                       };
+
+                       cooling-maps {
+                               map0 {
+                                       trip = <&cpu_alert0>;
+                                       cooling-device = <&fan0 THERMAL_NO_LIMIT 0>;
+                               };
+
+                               map1 {
+                                       trip = <&cpu_alert1>;
+                                       cooling-device = <&fan0 1 87>;
+                               };
+
+                               map2 {
+                                       trip = <&cpu_alert2>;
+                                       cooling-device = <&fan0 88 100>;
+                               };
+
+                               map3 {
+                                       trip = <&cpu_alert3>;
+                                       cooling-device = <&fan0 101 147>;
+                               };
+
+                               map4 {
+                                       trip = <&cpu_alert4>;
+                                       cooling-device = <&fan0 148 207>;
+                               };
+
+                               map5 {
+                                       trip = <&cpu_alert5>;
+                                       cooling-device = <&fan0 208 231>;
+                               };
+
+                               map6 {
+                                       trip = <&cpu_alert6>;
+                                       cooling-device =<&fan0 232 THERMAL_NO_LIMIT>;
+                               };
+                       };
+               };
+       };
+};
+
+&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>;
+                       };
+
+                       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";
+               status: power-green {
+                       label = "wndr4700:green:power";
+                       gpios = <&GPIO0 8 GPIO_ACTIVE_HIGH>;
+               };
+
+               failsafe: 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";
+};
diff --git a/target/linux/apm821xx/dts/wd-mybooklive-duo.dts b/target/linux/apm821xx/dts/wd-mybooklive-duo.dts
new file mode 100644 (file)
index 0000000..4f6cc50
--- /dev/null
@@ -0,0 +1,38 @@
+/*
+ * Device Tree Source for AMCC Canyonlands (460EX)
+ *
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ * (c) Copyright 2010 Western Digital Technologies, Inc. All Rights Reserved.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "apollo3g.dtsi"
+
+/ {
+       compatible = "wd,mybooklive-duo", "amcc,apollo3g";
+       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/wd-mybooklive.dts b/target/linux/apm821xx/dts/wd-mybooklive.dts
new file mode 100644 (file)
index 0000000..d841352
--- /dev/null
@@ -0,0 +1,17 @@
+/*
+ * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
+ * (c) Copyright 2010 Western Digital Technologies, Inc. All Rights Reserved.
+ *
+ * This file is licensed under the terms of the GNU General Public
+ * License version 2.  This program is licensed "as is" without
+ * any warranty of any kind, whether express or implied.
+ */
+
+/dts-v1/;
+
+#include "apollo3g.dtsi"
+
+/ {
+       compatible = "wd,mybooklive", "amcc,apollo3g";
+       model = "MyBook Live";
+};
diff --git a/target/linux/apm821xx/dts/wndr4700.dts b/target/linux/apm821xx/dts/wndr4700.dts
deleted file mode 100644 (file)
index 2e0addf..0000000
+++ /dev/null
@@ -1,409 +0,0 @@
-/*
- * Device Tree Source for Netgear WNDR4700/WNDR4720 Series
- *
- * Copyright 2008 DENX Software Engineering, Stefan Roese <sr@denx.de>
- *
- * This file is licensed under the terms of the GNU General Public
- * License version 2.  This program is licensed "as is" without
- * any warranty of any kind, whether express or implied.
- */
-
-/dts-v1/;
-
-#include "apm82181.dtsi"
-#include <dt-bindings/thermal/thermal.h>
-
-/ {
-       model = "Netgear WNDR4700/WNDR4720 Series";
-       compatible = "netgear,wndr4700";
-
-       aliases {
-               serial0 = &UART0;
-               led-boot = &status;
-               led-failsafe = &failsafe;
-               led-running = &status;
-               led-upgrade = &status;
-       };
-
-       chosen {
-               linux,stdout-path = "/plb/opb/serial@ef600300";
-       };
-
-       thermal-zones {
-               cpu_thermal: cpu-thermal {
-                       polling-delay-passive = <10000>; /* milliseconds */
-                       polling-delay = <20000>; /* milliseconds */
-
-                       thermal-sensors = <&temp0 1>;
-
-                       trips {
-                               /*
-                                * Once the thermal governers are a bit smarter
-                                * and do hysteresis properly, we can disable
-                                * the fan when the HDD and CPU has < 39 C.
-                                */
-                               cpu_alert0: cpu-alert0 {
-                                       temperature = <25000>;
-                                       hysteresis = <2000>;
-                                       type = "active";
-                               };
-
-                               cpu_alert1: cpu-alert1 {
-                                       temperature = <27000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "active";
-                               };
-
-                               cpu_alert2: cpu-alert2 {
-                                       temperature = <65000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "active";
-                               };
-
-                               cpu_alert3: cpu-alert3 {
-                                       temperature = <70000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "active";
-                               };
-
-                               cpu_alert4: cpu-alert4 {
-                                       temperature = <75000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "active";
-                               };
-
-                               cpu_alert5: cpu-alert5 {
-                                       temperature = <80000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "active";
-                               };
-
-                               cpu_alert6: cpu-alert6 {
-                                       temperature = <850000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "active";
-                               };
-
-                               cpu_crit: cpu-crit {
-                                       temperature = <90000>; /* millicelsius */
-                                       hysteresis = <2000>; /* millicelsius */
-                                       type = "critical";
-                               };
-                       };
-
-                       cooling-maps {
-                               map0 {
-                                       trip = <&cpu_alert0>;
-                                       cooling-device = <&fan0 THERMAL_NO_LIMIT 0>;
-                               };
-
-                               map1 {
-                                       trip = <&cpu_alert1>;
-                                       cooling-device = <&fan0 1 87>;
-                               };
-
-                               map2 {
-                                       trip = <&cpu_alert2>;
-                                       cooling-device = <&fan0 88 100>;
-                               };
-
-                               map3 {
-                                       trip = <&cpu_alert3>;
-                                       cooling-device = <&fan0 101 147>;
-                               };
-
-                               map4 {
-                                       trip = <&cpu_alert4>;
-                                       cooling-device = <&fan0 148 207>;
-                               };
-
-                               map5 {
-                                       trip = <&cpu_alert5>;
-                                       cooling-device = <&fan0 208 231>;
-                               };
-
-                               map6 {
-                                       trip = <&cpu_alert6>;
-                                       cooling-device =<&fan0 232 THERMAL_NO_LIMIT>;
-                               };
-                       };
-               };
-       };
-};
-
-&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>;
-                       };
-
-                       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";
-               status: power-green {
-                       label = "wndr4700:green:power";
-                       gpios = <&GPIO0 8 GPIO_ACTIVE_HIGH>;
-               };
-
-               failsafe: 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";
-};
index 217bff2..6efd388 100644 (file)
@@ -70,7 +70,7 @@ define Device/mr24
   DEVICE_TITLE := Cisco Meraki MR24
   DEVICE_PACKAGES := kmod-spi-gpio
   BOARD_NAME := mr24
-  DEVICE_DTS := MR24
+  DEVICE_DTS := meraki-mr24
   BLOCKSIZE := 63k
   IMAGES := sysupgrade.tar
   DTB_SIZE := 64512
@@ -91,7 +91,7 @@ define Device/mx60
   DEVICE_PACKAGES := kmod-spi-gpio kmod-usb-ledtrig-usbport kmod-usb-dwc2 \
   kmod-usb-storage block-mount
   BOARD_NAME := mx60
-  DEVICE_DTS := MX60
+  DEVICE_DTS := meraki-mx60
   BLOCKSIZE := 63k
   IMAGES := sysupgrade.tar
   DTB_SIZE := 64512
@@ -157,7 +157,7 @@ define Device/WNDR4700
        kmod-nls-utf8 kmod-usb3 kmod-usb-dwc2 kmod-usb-storage \
        partx-utils
   BOARD_NAME := wndr4700
-  DEVICE_DTS := wndr4700
+  DEVICE_DTS := netgear-wndr4700
   PAGESIZE := 2048
   SUBPAGESIZE := 512
   BLOCKSIZE := 128k
@@ -225,7 +225,7 @@ endef
 define Device/MyBookLiveSingle
 $(Device/MyBookLiveDefault)
   DEVICE_TITLE := Western Digital My Book Live
-  DEVICE_DTS := apollo3g
+  DEVICE_DTS := wd-mybooklive
 endef
 
 TARGET_DEVICES += MyBookLiveSingle
@@ -234,7 +234,7 @@ define Device/MyBookLiveDuo
 $(Device/MyBookLiveDefault)
   DEVICE_TITLE := Western Digital My Book Live Duo
   DEVICE_PACKAGES := kmod-usb-dwc2 kmod-usb-ledtrig-usbport kmod-usb-storage kmod-fs-vfat wpad-mini
-  DEVICE_DTS := apollo3g-duo
+  DEVICE_DTS := wd-mybooklive-duo
 endef
 
 TARGET_DEVICES += MyBookLiveDuo