ath79: fix dts files
authorMathias Kresin <dev@kresin.me>
Tue, 8 May 2018 05:22:38 +0000 (07:22 +0200)
committerMathias Kresin <dev@kresin.me>
Thu, 17 May 2018 05:40:19 +0000 (07:40 +0200)
Add the SoC compatible to the individual dts files. Rename the dts files
to match the common pattern.

Remove dts files wich aren't used and no image in ar71xx exists.

Signed-off-by: Mathias Kresin <dev@kresin.me>
23 files changed:
target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts [deleted file]
target/linux/ath79/dts/ar7241_ubnt-nano-m.dts [deleted file]
target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts [deleted file]
target/linux/ath79/dts/ar7241_ubnt-unifi.dts [deleted file]
target/linux/ath79/dts/ar7241_ubnt-xm.dts [deleted file]
target/linux/ath79/dts/ar7241_ubnt-xm.dtsi [deleted file]
target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts [new file with mode: 0644]
target/linux/ath79/dts/ar7241_ubnt_nano-m.dts [new file with mode: 0644]
target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts [new file with mode: 0644]
target/linux/ath79/dts/ar7241_ubnt_unifi.dts [new file with mode: 0644]
target/linux/ath79/dts/ar7241_ubnt_xm.dtsi [new file with mode: 0644]
target/linux/ath79/dts/ar9330_gl_ar150.dts [deleted file]
target/linux/ath79/dts/ar9330_glinet_ar150.dts [new file with mode: 0644]
target/linux/ath79/dts/ar9331_dpt_module.dts
target/linux/ath79/dts/ar9331_dragino_ms14.dts
target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts [new file with mode: 0644]
target/linux/ath79/dts/ar9331_ew_dorin.dts [deleted file]
target/linux/ath79/dts/ar9331_omega.dts
target/linux/ath79/dts/ar9331_tl_mr3020.dts
target/linux/ath79/dts/qca9558_om5p_ac.dts [deleted file]
target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts [new file with mode: 0644]
target/linux/ath79/image/generic-ubnt.mk
target/linux/ath79/image/generic.mk

diff --git a/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt-bullet-m.dts
deleted file mode 100644 (file)
index 067c612..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "ar7241_ubnt-xm.dtsi"
-
-/ {
-       compatible = "ubnt,xm", "qca,ar7241";
-       model = "Ubiquiti Bullet M";
-};
-
-&eth1 {
-       compatible = "syscon";
-};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt-nano-m.dts
deleted file mode 100644 (file)
index 8fbd7a6..0000000
+++ /dev/null
@@ -1,9 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "ar7241_ubnt-xm.dtsi"
-
-/ {
-       compatible = "ubnt,nm", "qca,ar7241";
-       model = "Ubiquiti Nanostation M";
-};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt-rocket-m.dts
deleted file mode 100644 (file)
index e1ef6d7..0000000
+++ /dev/null
@@ -1,21 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "ar7241_ubnt-xm.dtsi"
-
-/ {
-       compatible = "ubnt,rm", "qca,ar7241";
-       model = "Ubiquiti Rocket M";
-};
-
-&eth1 {
-       compatible = "syscon";
-};
-
-&usb_phy {
-       status = "okay";
-};
-
-&usb {
-       status = "okay";
-};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-unifi.dts b/target/linux/ath79/dts/ar7241_ubnt-unifi.dts
deleted file mode 100644 (file)
index 1cb45e6..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar7241.dtsi"
-
-/ {
-       compatible = "ubnt,unifi", "qca,ar7241";
-       model = "Ubiquiti UniFi AP";
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x4000000>;
-       };
-
-       extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <40000000>;
-       };
-
-       keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               poll-interval = <20>;
-               button@0 {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               led@0 {
-                       label = "ubnt:green:dome";
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-               };
-
-               led@1 {
-                       label = "ubnt:orange:dome";
-                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-&pll {
-       clocks = <&extosc>;
-};
-
-&spi {
-       status = "okay";
-       num-cs = <1>;
-
-       flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "mx25l6405d";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x040000>;
-                               read-only;
-                       };
-
-                       partition@1 {
-                               label = "u-boot-env";
-                               reg = <0x040000 0x010000>;
-                       };
-
-                       partition@2 {
-                               label = "firmware";
-                               reg = <0x050000 0x750000>;
-                       };
-
-                       partition@3 {
-                               label = "board_config";
-                               reg = <0x7a0000 0x010000>;
-                               read-only;
-                       };
-
-                       partition@4 {
-                               label = "cfg";
-                               reg = <0x7b0000 0x040000>;
-                               read-only;
-                       };
-
-                       art: partition@5 {
-                               label = "art";
-                               reg = <0x7f0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&pcie {
-       status = "okay";
-
-       ath9k@0000 {
-               reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x0>;
-       phy-handle = <&phy4>;
-};
-
-&eth1 {
-       status = "okay";
-
-       compatible = "syscon";
-};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-xm.dts b/target/linux/ath79/dts/ar7241_ubnt-xm.dts
deleted file mode 100644 (file)
index efb01f7..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include "ar7241_ubnt-xm.dtsi"
-
-/ {
-       compatible = "ubnt,xm", "qca,ar7241";
-       model = "Ubiquiti Networks XM (rev 1.0) board";
-};
-
-&eth1 {
-       compatible = "syscon";
-};
diff --git a/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt-xm.dtsi
deleted file mode 100644 (file)
index bea9adc..0000000
+++ /dev/null
@@ -1,153 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar7241.dtsi"
-
-/ {
-       compatible = "ubnt,xm", "qca,ar7241";
-       model = "Ubiquiti Networks XM (rev 1.0) board";
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x2000000>;
-       };
-
-/*     extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <40000000>;
-       };
-*/
-       keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               poll-interval = <20>;
-               button@0 {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-                       debounce-interval = <60>;
-               };
-       };
-
-       leds {
-               compatible = "gpio-leds";
-               led@0 {
-                       label = "ubnt:red:link1";
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-               };
-
-               led@1 {
-                       label = "ubnt:orange:link2";
-                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
-               };
-
-               led@2 {
-                       label = "ubnt:green:link3";
-                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
-               };
-
-               led@3 {
-                       label = "ubnt:green:link4";
-                       gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-/*&pll {
-       clocks = <&extosc>;
-};*/
-
-&spi {
-       status = "okay";
-       num-cs = <1>;
-
-       flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "mx25l6405d";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x040000>;
-                               read-only;
-                       };
-
-                       partition@1 {
-                               label = "u-boot-env";
-                               reg = <0x040000 0x010000>;
-                       };
-
-                       partition@2 {
-                               label = "firmware";
-                               reg = <0x050000 0x750000>;
-                       };
-
-                       partition@3 {
-                               label = "board_config";
-                               reg = <0x7a0000 0x010000>;
-                               read-only;
-                       };
-
-                       partition@4 {
-                               label = "cfg";
-                               reg = <0x7b0000 0x040000>;
-                               read-only;
-                       };
-
-                       art: partition@5 {
-                               label = "art";
-                               reg = <0x7f0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&pcie {
-       status = "okay";
-
-       ath9k@0000 {
-               reg = <0x0000 0 0 0 0>;
-               qca,no-eeprom;
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x0>;
-
-       phy-mode = "mii";
-       phy-handle = <&phy4>;
-};
-
-&eth1 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x6>;
-};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts b/target/linux/ath79/dts/ar7241_ubnt_bullet-m.dts
new file mode 100644 (file)
index 0000000..0de97ea
--- /dev/null
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "ar7241_ubnt_xm.dtsi"
+
+/ {
+       compatible = "ubnt,bullet-m", "qca,ar7241";
+       model = "Ubiquiti Bullet M";
+};
+
+&eth1 {
+       compatible = "syscon";
+};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts b/target/linux/ath79/dts/ar7241_ubnt_nano-m.dts
new file mode 100644 (file)
index 0000000..417e503
--- /dev/null
@@ -0,0 +1,9 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "ar7241_ubnt_xm.dtsi"
+
+/ {
+       compatible = "ubnt,nano-m", "qca,ar7241";
+       model = "Ubiquiti Nanostation M";
+};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts b/target/linux/ath79/dts/ar7241_ubnt_rocket-m.dts
new file mode 100644 (file)
index 0000000..36fa275
--- /dev/null
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include "ar7241_ubnt_xm.dtsi"
+
+/ {
+       compatible = "ubnt,rocket-m", "qca,ar7241";
+       model = "Ubiquiti Rocket M";
+};
+
+&eth1 {
+       compatible = "syscon";
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&usb {
+       status = "okay";
+};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_unifi.dts b/target/linux/ath79/dts/ar7241_ubnt_unifi.dts
new file mode 100644 (file)
index 0000000..1cb45e6
--- /dev/null
@@ -0,0 +1,142 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar7241.dtsi"
+
+/ {
+       compatible = "ubnt,unifi", "qca,ar7241";
+       model = "Ubiquiti UniFi AP";
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x4000000>;
+       };
+
+       extosc: ref {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <40000000>;
+       };
+
+       keys {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               poll-interval = <20>;
+               button@0 {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               led@0 {
+                       label = "ubnt:green:dome";
+                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+               };
+
+               led@1 {
+                       label = "ubnt:orange:dome";
+                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+&pll {
+       clocks = <&extosc>;
+};
+
+&spi {
+       status = "okay";
+       num-cs = <1>;
+
+       flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "mx25l6405d";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0x750000>;
+                       };
+
+                       partition@3 {
+                               label = "board_config";
+                               reg = <0x7a0000 0x010000>;
+                               read-only;
+                       };
+
+                       partition@4 {
+                               label = "cfg";
+                               reg = <0x7b0000 0x040000>;
+                               read-only;
+                       };
+
+                       art: partition@5 {
+                               label = "art";
+                               reg = <0x7f0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pcie {
+       status = "okay";
+
+       ath9k@0000 {
+               reg = <0x0000 0 0 0 0>;
+               qca,no-eeprom;
+       };
+};
+
+&mdio0 {
+       status = "okay";
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               phy-mode = "mii";
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       mtd-mac-address = <&art 0x0>;
+       phy-handle = <&phy4>;
+};
+
+&eth1 {
+       status = "okay";
+
+       compatible = "syscon";
+};
diff --git a/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi b/target/linux/ath79/dts/ar7241_ubnt_xm.dtsi
new file mode 100644 (file)
index 0000000..bea9adc
--- /dev/null
@@ -0,0 +1,153 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar7241.dtsi"
+
+/ {
+       compatible = "ubnt,xm", "qca,ar7241";
+       model = "Ubiquiti Networks XM (rev 1.0) board";
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x2000000>;
+       };
+
+/*     extosc: ref {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <40000000>;
+       };
+*/
+       keys {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               poll-interval = <20>;
+               button@0 {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+                       debounce-interval = <60>;
+               };
+       };
+
+       leds {
+               compatible = "gpio-leds";
+               led@0 {
+                       label = "ubnt:red:link1";
+                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+               };
+
+               led@1 {
+                       label = "ubnt:orange:link2";
+                       gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
+               };
+
+               led@2 {
+                       label = "ubnt:green:link3";
+                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
+               };
+
+               led@3 {
+                       label = "ubnt:green:link4";
+                       gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+/*&pll {
+       clocks = <&extosc>;
+};*/
+
+&spi {
+       status = "okay";
+       num-cs = <1>;
+
+       flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "mx25l6405d";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0x750000>;
+                       };
+
+                       partition@3 {
+                               label = "board_config";
+                               reg = <0x7a0000 0x010000>;
+                               read-only;
+                       };
+
+                       partition@4 {
+                               label = "cfg";
+                               reg = <0x7b0000 0x040000>;
+                               read-only;
+                       };
+
+                       art: partition@5 {
+                               label = "art";
+                               reg = <0x7f0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&pcie {
+       status = "okay";
+
+       ath9k@0000 {
+               reg = <0x0000 0 0 0 0>;
+               qca,no-eeprom;
+       };
+};
+
+&mdio0 {
+       status = "okay";
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               phy-mode = "mii";
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       mtd-mac-address = <&art 0x0>;
+
+       phy-mode = "mii";
+       phy-handle = <&phy4>;
+};
+
+&eth1 {
+       status = "okay";
+
+       mtd-mac-address = <&art 0x6>;
+};
diff --git a/target/linux/ath79/dts/ar9330_gl_ar150.dts b/target/linux/ath79/dts/ar9330_gl_ar150.dts
deleted file mode 100644 (file)
index 97beab1..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar9330.dtsi"
-
-/ {
-       model = "GL.iNet GL-AR150";
-       compatible = "glinet,ar150";
-
-       aliases {
-               serial0 = &uart;
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x4000000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               wlan {
-                       label = "gl-ar150:orange:wlan";
-                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
-                       default-state = "off";
-               };
-
-               lan {
-                       label = "gl-ar150:green:lan";
-                       gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
-                       default-state = "off";
-               };
-
-               wan {
-                       label = "gl-ar150:green:wan";
-                       gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
-                       default-state = "off";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <100>;
-
-               manual {
-                       label = "manual";
-                       linux,code = <BTN_7>;
-                       gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
-               };
-
-               auto {
-                       label = "auto";
-                       linux,code = <BTN_8>;
-                       gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
-               };
-
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-&gpio {
-       status = "okay";
-};
-
-&usb {
-       dr_mode = "host";
-       status = "okay";
-};
-
-&usb_phy {
-       status = "okay";
-       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
-};
-
-&spi {
-       num-chipselects = <1>;
-       status = "okay";
-
-       spiflash {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <104000000>;
-               reg = <0>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x040000>;
-                               read-only;
-                       };
-
-                       partition@1 {
-                               label = "u-boot-env";
-                               reg = <0x040000 0x010000>;
-                       };
-
-                       partition@2 {
-                               label = "firmware";
-                               reg = <0x050000 0xfa0000>;
-                       };
-
-                       art: partition@3 {
-                               label = "ART";
-                               reg = <0xff0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "mii";
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x0>;
-
-       phy-handle = <&phy4>;
-};
-
-&eth1 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x0>;
-
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
-
-       gmac-config {
-               device = <&gmac>;
-
-               switch-phy-addr-swap = <0>;
-               switch-phy-swap = <0>;
-       };
-};
diff --git a/target/linux/ath79/dts/ar9330_glinet_ar150.dts b/target/linux/ath79/dts/ar9330_glinet_ar150.dts
new file mode 100644 (file)
index 0000000..16d8613
--- /dev/null
@@ -0,0 +1,162 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar9330.dtsi"
+
+/ {
+       model = "GL.iNet GL-AR150";
+       compatible = "glinet,ar150", "qca,ar9330";
+
+       aliases {
+               serial0 = &uart;
+       };
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x4000000>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               wlan {
+                       label = "gl-ar150:orange:wlan";
+                       gpios = <&gpio 0 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+
+               lan {
+                       label = "gl-ar150:green:lan";
+                       gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+
+               wan {
+                       label = "gl-ar150:green:wan";
+                       gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
+                       default-state = "off";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <100>;
+
+               manual {
+                       label = "manual";
+                       linux,code = <BTN_7>;
+                       gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
+               };
+
+               auto {
+                       label = "auto";
+                       linux,code = <BTN_8>;
+                       gpios = <&gpio 8 GPIO_ACTIVE_HIGH>;
+               };
+
+               reset {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+&gpio {
+       status = "okay";
+};
+
+&usb {
+       dr_mode = "host";
+       status = "okay";
+};
+
+&usb_phy {
+       status = "okay";
+       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
+};
+
+&spi {
+       num-chipselects = <1>;
+       status = "okay";
+
+       spiflash {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <104000000>;
+               reg = <0>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0xfa0000>;
+                       };
+
+                       art: partition@3 {
+                               label = "ART";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&mdio0 {
+       status = "okay";
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               phy-mode = "mii";
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       mtd-mac-address = <&art 0x0>;
+
+       phy-handle = <&phy4>;
+};
+
+&eth1 {
+       status = "okay";
+
+       mtd-mac-address = <&art 0x0>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+
+       gmac-config {
+               device = <&gmac>;
+
+               switch-phy-addr-swap = <0>;
+               switch-phy-swap = <0>;
+       };
+};
index bcd863605b98e8c5e6b7c2f27caf04d0f79cdabb..dc4df6b276503b30f38c0a5c188254d10072e593 100644 (file)
@@ -8,7 +8,7 @@
 
 / {
        model = "DPTechnics DPT-Module";
-       compatible = "dptechnics,dpt-module";
+       compatible = "dptechnics,dpt-module", "qca,ar9331";
 
        aliases {
                serial0 = &uart;
index e7c446aa71e00d464b80d65fb6ea40da0f8026a2..9fb674eb2fe85c31e23ca1a95d1074b5f79640cd 100644 (file)
@@ -8,7 +8,7 @@
 
 / {
        model = "Dragino MS14 (Dragino 2)";
-       compatible = "dragino,ms14";
+       compatible = "dragino,ms14", "qca,ar9331";
 
        aliases {
                serial0 = &uart;
diff --git a/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts b/target/linux/ath79/dts/ar9331_embeddedwireless_dorin.dts
new file mode 100644 (file)
index 0000000..4b204b7
--- /dev/null
@@ -0,0 +1,130 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "ar9331.dtsi"
+
+/ {
+       model = "Embedded Wireless Dorin";
+       compatible = "embeddedwireless,dorin", "qca,ar9331";
+
+       aliases {
+               serial0 = &uart;
+       };
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x4000000>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               status {
+                       label = "dorin:green:status";
+                       gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <100>;
+
+               wps {
+                       label = "wps";
+                       linux,code = <KEY_WPS_BUTTON>;
+                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
+               };
+
+               reset {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&uart {
+       status = "okay";
+};
+
+&gpio {
+       status = "okay";
+};
+
+&usb {
+       dr_mode = "host";
+       status = "okay";
+};
+
+&usb_phy {
+       status = "okay";
+};
+
+&spi {
+       num-chipselects = <1>;
+       status = "okay";
+
+       spiflash {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "jedec,spi-nor";
+               spi-max-frequency = <104000000>;
+               reg = <0>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x050000 0xfa0000>;
+                       };
+
+                       art: partition@3 {
+                               label = "ART";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&eth1 {
+       status = "okay";
+
+       mtd-mac-address = <&art 0x1002>;
+
+       fixed-link {
+               speed = <1000>;
+               full-duplex;
+       };
+
+       gmac-config {
+               device = <&gmac>;
+
+               switch-phy-addr-swap = <1>;
+               switch-phy-swap = <1>;
+       };
+};
+
+&mdio1 {
+       status = "okay";
+};
diff --git a/target/linux/ath79/dts/ar9331_ew_dorin.dts b/target/linux/ath79/dts/ar9331_ew_dorin.dts
deleted file mode 100644 (file)
index fd18593..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "ar9331.dtsi"
-
-/ {
-       model = "Embedded Wireless Dorin";
-       compatible = "embeddedwireless,dorin";
-
-       aliases {
-               serial0 = &uart;
-       };
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x4000000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               status {
-                       label = "dorin:green:status";
-                       gpios = <&gpio 21 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <100>;
-
-               wps {
-                       label = "wps";
-                       linux,code = <KEY_WPS_BUTTON>;
-                       gpios = <&gpio 11 GPIO_ACTIVE_LOW>;
-               };
-
-               reset {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 6 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&uart {
-       status = "okay";
-};
-
-&gpio {
-       status = "okay";
-};
-
-&usb {
-       dr_mode = "host";
-       status = "okay";
-};
-
-&usb_phy {
-       status = "okay";
-};
-
-&spi {
-       num-chipselects = <1>;
-       status = "okay";
-
-       spiflash {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "jedec,spi-nor";
-               spi-max-frequency = <104000000>;
-               reg = <0>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x040000>;
-                               read-only;
-                       };
-
-                       partition@1 {
-                               label = "u-boot-env";
-                               reg = <0x040000 0x010000>;
-                       };
-
-                       partition@2 {
-                               label = "firmware";
-                               reg = <0x050000 0xfa0000>;
-                       };
-
-                       art: partition@3 {
-                               label = "ART";
-                               reg = <0xff0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&eth1 {
-       status = "okay";
-
-       mtd-mac-address = <&art 0x1002>;
-
-       fixed-link {
-               speed = <1000>;
-               full-duplex;
-       };
-
-       gmac-config {
-               device = <&gmac>;
-
-               switch-phy-addr-swap = <1>;
-               switch-phy-swap = <1>;
-       };
-};
-
-&mdio1 {
-       status = "okay";
-};
index 1225b245fddb020ae4927989ecbfa44cef283632..32551427ea67362e4198bad6ca7a884ffc085b16 100644 (file)
@@ -8,7 +8,7 @@
 
 / {
        model = "Onion Omega";
-       compatible = "onion,omega";
+       compatible = "onion,omega", "qca,ar9331";
 
        aliases {
                serial0 = &uart;
index 7439768a2b108babdc6ee2f47924b6c962d1909e..34ee805b331ebcc6835a23e149ff7ca76ce85a70 100644 (file)
@@ -8,7 +8,7 @@
 
 / {
        model = "TP-Link TL-MR3020";
-       compatible = "tplink,tl-mr3020";
+       compatible = "tplink,tl-mr3020", "qca,ar9331";
 
        aliases {
                serial0 = &uart;
diff --git a/target/linux/ath79/dts/qca9558_om5p_ac.dts b/target/linux/ath79/dts/qca9558_om5p_ac.dts
deleted file mode 100644 (file)
index 974b1c6..0000000
+++ /dev/null
@@ -1,176 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
-/dts-v1/;
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/input/input.h>
-
-#include "qca9557.dtsi"
-
-/ {
-       compatible = "openmesh,om5p-ac-v2", "qca,qca9557";
-       model = "OpenMesh OM5P-AC V2";
-
-       memory@0 {
-               device_type = "memory";
-               reg = <0x0 0x8000000>;
-       };
-
-       extosc: ref {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-output-names = "ref";
-               clock-frequency = <40000000>;
-       };
-
-       leds {
-               compatible = "gpio-leds";
-
-               power {
-                       label = "om5pac:blue:power";
-                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               wifi_green {
-                       label = "om5pac:green:wifi";
-                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               wifi_yellow {
-                       label = "om5pac:yellow:wifi";
-                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-
-               wifi_red {
-                       label = "om5pac:red:wifi";
-                       gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
-                       default-state = "off";
-               };
-       };
-
-       keys {
-               compatible = "gpio-keys-polled";
-               #address-cells = <1>;
-               #size-cells = <0>;
-               poll-interval = <100>;
-
-               button@0 {
-                       label = "reset";
-                       linux,code = <KEY_RESTART>;
-                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
-               };
-       };
-
-       gpio-export {
-               compatible = "gpio-export";
-               #size-cells = <0>;
-
-               gpio_pa_dcdc {
-                       gpio-export,name = "om5pac:pa_dcdc";
-                       gpio-export,output = <1>;
-                       gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
-               };
-               gpio_pa_high {
-                       gpio-export,name = "om5pac:pa_high";
-                       gpio-export,output = <1>;
-                       gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-               };
-       };
-};
-
-&pinmux {
-       pinmux_pa_dcdc_pins {
-               pinctrl-single,bits = <0x0 0xff00 0x0>;
-       };
-
-       pinmux_pa_high_pins {
-               pinctrl-single,bits = <0x10 0xff 0x0>;
-       };
-};
-
-&pcie0 {
-       status = "okay";
-};
-
-&uart {
-       status = "okay";
-};
-
-&pll {
-       clocks = <&extosc>;
-};
-
-&spi {
-       status = "okay";
-       num-cs = <1>;
-
-       flash@0 {
-               #address-cells = <1>;
-               #size-cells = <1>;
-               compatible = "mx25l12805d";
-               reg = <0>;
-               spi-max-frequency = <25000000>;
-
-               partitions {
-                       compatible = "fixed-partitions";
-                       #address-cells = <1>;
-                       #size-cells = <1>;
-
-                       partition@0 {
-                               label = "u-boot";
-                               reg = <0x000000 0x040000>;
-                               read-only;
-                       };
-
-                       partition@1 {
-                               label = "u-boot-env";
-                               reg = <0x040000 0x010000>;
-                       };
-
-                       partition@2 {
-                               label = "firmware";
-                               reg = <0x850000 0x7a0000>;
-                       };
-
-                       partition@3 {
-                               label = "ART";
-                               reg = <0xff0000 0x010000>;
-                               read-only;
-                       };
-               };
-       };
-};
-
-&mdio0 {
-       status = "okay";
-
-       phy4: ethernet-phy@4 {
-               reg = <4>;
-               phy-mode = "rgmii-id";
-       };
-};
-
-&mdio1 {
-       status = "okay";
-
-       phy1: ethernet-phy@1 {
-               reg = <1>;
-               phy-mode = "sgmii";
-       };
-};
-
-&eth0 {
-       status = "okay";
-
-       phy-handle = <&phy4>;
-       phy-mode = "rgmii";
-};
-
-&eth1 {
-       status = "okay";
-
-       phy-handle = <&phy1>;
-       phy-mode = "sgmii";
-};
diff --git a/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts b/target/linux/ath79/dts/qca9558_openmesh_om5p-ac-v2.dts
new file mode 100644 (file)
index 0000000..974b1c6
--- /dev/null
@@ -0,0 +1,176 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/dts-v1/;
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/input/input.h>
+
+#include "qca9557.dtsi"
+
+/ {
+       compatible = "openmesh,om5p-ac-v2", "qca,qca9557";
+       model = "OpenMesh OM5P-AC V2";
+
+       memory@0 {
+               device_type = "memory";
+               reg = <0x0 0x8000000>;
+       };
+
+       extosc: ref {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-output-names = "ref";
+               clock-frequency = <40000000>;
+       };
+
+       leds {
+               compatible = "gpio-leds";
+
+               power {
+                       label = "om5pac:blue:power";
+                       gpios = <&gpio 14 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+
+               wifi_green {
+                       label = "om5pac:green:wifi";
+                       gpios = <&gpio 13 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+
+               wifi_yellow {
+                       label = "om5pac:yellow:wifi";
+                       gpios = <&gpio 15 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+
+               wifi_red {
+                       label = "om5pac:red:wifi";
+                       gpios = <&gpio 23 GPIO_ACTIVE_LOW>;
+                       default-state = "off";
+               };
+       };
+
+       keys {
+               compatible = "gpio-keys-polled";
+               #address-cells = <1>;
+               #size-cells = <0>;
+               poll-interval = <100>;
+
+               button@0 {
+                       label = "reset";
+                       linux,code = <KEY_RESTART>;
+                       gpios = <&gpio 1 GPIO_ACTIVE_LOW>;
+               };
+       };
+
+       gpio-export {
+               compatible = "gpio-export";
+               #size-cells = <0>;
+
+               gpio_pa_dcdc {
+                       gpio-export,name = "om5pac:pa_dcdc";
+                       gpio-export,output = <1>;
+                       gpios = <&gpio 2 GPIO_ACTIVE_HIGH>;
+               };
+               gpio_pa_high {
+                       gpio-export,name = "om5pac:pa_high";
+                       gpio-export,output = <1>;
+                       gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
+               };
+       };
+};
+
+&pinmux {
+       pinmux_pa_dcdc_pins {
+               pinctrl-single,bits = <0x0 0xff00 0x0>;
+       };
+
+       pinmux_pa_high_pins {
+               pinctrl-single,bits = <0x10 0xff 0x0>;
+       };
+};
+
+&pcie0 {
+       status = "okay";
+};
+
+&uart {
+       status = "okay";
+};
+
+&pll {
+       clocks = <&extosc>;
+};
+
+&spi {
+       status = "okay";
+       num-cs = <1>;
+
+       flash@0 {
+               #address-cells = <1>;
+               #size-cells = <1>;
+               compatible = "mx25l12805d";
+               reg = <0>;
+               spi-max-frequency = <25000000>;
+
+               partitions {
+                       compatible = "fixed-partitions";
+                       #address-cells = <1>;
+                       #size-cells = <1>;
+
+                       partition@0 {
+                               label = "u-boot";
+                               reg = <0x000000 0x040000>;
+                               read-only;
+                       };
+
+                       partition@1 {
+                               label = "u-boot-env";
+                               reg = <0x040000 0x010000>;
+                       };
+
+                       partition@2 {
+                               label = "firmware";
+                               reg = <0x850000 0x7a0000>;
+                       };
+
+                       partition@3 {
+                               label = "ART";
+                               reg = <0xff0000 0x010000>;
+                               read-only;
+                       };
+               };
+       };
+};
+
+&mdio0 {
+       status = "okay";
+
+       phy4: ethernet-phy@4 {
+               reg = <4>;
+               phy-mode = "rgmii-id";
+       };
+};
+
+&mdio1 {
+       status = "okay";
+
+       phy1: ethernet-phy@1 {
+               reg = <1>;
+               phy-mode = "sgmii";
+       };
+};
+
+&eth0 {
+       status = "okay";
+
+       phy-handle = <&phy4>;
+       phy-mode = "rgmii";
+};
+
+&eth1 {
+       status = "okay";
+
+       phy-handle = <&phy1>;
+       phy-mode = "sgmii";
+};
index 17c89fcb1c76d1bff3f6c4bfe037ed898102a9e1..b6141522638ed3029b96dd09efccadb1091d1ab5 100644 (file)
@@ -81,35 +81,35 @@ define Device/ubnt-airrouter
 endef
 #TARGET_DEVICES += ubnt-airrouter
 
-define Device/ubnt-bullet-m
+define Device/ubnt_bullet-m
   $(Device/ubnt-xm)
   DEVICE_TITLE := Ubiquiti Bullet-M
   BOARDNAME := UBNT-BM
 endef
-TARGET_DEVICES += ubnt-bullet-m
+TARGET_DEVICES += ubnt_bullet-m
 
-define Device/ubnt-rocket-m
+define Device/ubnt_rocket-m
   $(Device/ubnt-xm)
   DEVICE_TITLE := Ubiquiti Rocket-M
   BOARDNAME := UBNT-RM
 endef
-TARGET_DEVICES += ubnt-rocket-m
+TARGET_DEVICES += ubnt_rocket-m
 
-define Device/ubnt-nano-m
+define Device/ubnt_nano-m
   $(Device/ubnt-xm)
   DEVICE_TITLE := Ubiquiti Nano-M
   BOARDNAME := UBNT-NM
 endef
-TARGET_DEVICES += ubnt-nano-m
+TARGET_DEVICES += ubnt_nano-m
 
-define Device/ubnt-unifi
+define Device/ubnt_unifi
   $(Device/ubnt-bz)
   ATH_SOC := ar7241
   DEVICE_TITLE := Ubiquiti UniFi
   BOARDNAME := UBNT-UF
   DEVICE_PROFILE += UBNTUNIFI
 endef
-TARGET_DEVICES += ubnt-unifi
+TARGET_DEVICES += ubnt_unifi
 
 define Device/ubnt-unifiac
   DEVICE_PACKAGES := kmod-usb-core kmod-usb2
index dab98b72254c315f7782f84acfd224708da6c28c..d6983605ccf3f2028522f888e29136c2a4b914a3 100644 (file)
@@ -21,30 +21,30 @@ define Build/netgear-uImage
        $(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC))
 endef
 
-define Device/ew_dorin
+define Device/embeddedwireless_dorin
   ATH_SOC := ar9331
   DEVICE_TITLE := Embedded Wireless Dorin
   DEVICE_PACKAGES := kmod-usb-chipidea2
 endef
 
-TARGET_DEVICES += ew_dorin
+TARGET_DEVICES += embeddedwireless_dorin
 
-define Device/gl_ar150
+define Device/glinet_ar150
   ATH_SOC := ar9330
   DEVICE_TITLE := GL.iNet GL-AR150
   DEVICE_PACKAGES := kmod-usb-chipidea2
   IMAGE_SIZE := 16000k
 endef
-TARGET_DEVICES += gl_ar150
+TARGET_DEVICES += glinet_ar150
 
-define Device/om5p_ac
+define Device/openmesh_om5p-ac-v2
   ATH_SOC := qca9558
-  DEVICE_TITLE := OpenMesh OM5P-AC
+  DEVICE_TITLE := OpenMesh OM5P-AC v2
   DEVICE_PROFILE := OM5P-AC
   DEVICE_PACKAGES := kmod-ath10k ath10k-firmware-qca988x om-watchdog
 endef
 
-TARGET_DEVICES += om5p_ac
+TARGET_DEVICES += openmesh_om5p-ac-v2
 
 define Device/netgear_wndr3700
   ATH_SOC:=ar7100