ath79: add generic dtsi for Ubiquiti SW boards

Signed-off-by: Tobias Schramm <[email protected]>
[remove ubnt,sw compatible]
Signed-off-by: David Bauer <[email protected]>

target/linux/ath79/dts/ar7242_ubnt_edgeswitch-8xp.dts

@@ -1,67 +1,12 @@
 // 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 "ar7242.dtsi"
+#include "ar7242_ubnt_sw.dtsi"
 
 / {
 	compatible = "ubnt,edgeswitch-8xp", "qca,ar7242";
 	model = "Ubiquiti EdgeSwitch 8XP";
 
-	chosen {
-		bootargs = "console=ttyS0,115200n8";
-	};
-
-	aliases {
-		led-boot = &led_usr;
-		led-failsafe = &led_usr;
-		led-running = &led_usr;
-		led-upgrade = &led_usr;
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led_usr: usr {
-			label = "ubnt:yellow:usr";
-			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-	keys {
-		compatible = "gpio-keys";
-
-		reset {
-			linux,code = <KEY_RESTART>;
-			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
-			debounce-interval = <60>;
-		};
-	};
-
-	gpio_spi {
-		compatible = "spi-gpio";
-		#address-cells = <0x1>;
-		ranges;
-
-		sck-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
-		mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
-		cs-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
-		num-chipselects = <1>;
-
-		gpio_hc595: gpio_spi@0 {
-			compatible = "fairchild,74hc595";
-			reg = <0>;
-			registers-number = <2>;
-			spi-max-frequency = <100000>;
-			enable-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
-
-			gpio-controller;
-			#gpio-cells = <2>;
-		};
-	};
-
 	gpio-export {
 		compatible = "gpio-export";
 
@@ -163,54 +108,6 @@
 	};
 };
 
-&spi {
-	status = "okay";
-
-	num-cs = <1>;
-
-	flash@0 {
-		compatible = "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <25000000>;
-
-		partitions {
-			compatible = "fixed-partitions";
-			#address-cells = <1>;
-			#size-cells = <1>;
-
-			partition@0 {
-				reg = <0x000000 0x040000>;
-				label = "u-boot";
-				read-only;
-			};
-
-			partition@40000 {
-				reg = <0x040000 0x010000>;
-				label = "u-boot-env";
-				read-only;
-			};
-
-			partition@50000 {
-				compatible = "denx,uimage";
-				reg = <0x050000 0x760000>;
-				label = "firmware";
-			};
-
-			partition@7b0000 {
-				reg = <0x7b0000 0x040000>;
-				label = "cfg";
-				read-only;
-			};
-
-			art: partition@7f0000 {
-				reg = <0x7f0000 0x010000>;
-				label = "art";
-				read-only;
-			};
-		};
-	};
-};
-
 &mdio0 {
 	status = "okay";
 
@@ -278,29 +175,6 @@
 	};
 };
 
-&usb_phy {
-	status = "okay";
-};
-
-&usb {
-	#address-cells = <1>;
-	#size-cells = <0>;
-	status = "okay";
-
-	hub_port: port@1 {
-		reg = <1>;
-		#trigger-source-cells = <0>;
-	};
-};
-
-&pcie {
-	status = "okay";
-};
-
-&uart {
-	status = "okay";
-};
-
 &eth0 {
 	status = "okay";
 
@@ -314,9 +188,3 @@
 		full-duplex;
 	};
 };
-
-&eth1 {
-	status = "okay";
-
-	mtd-mac-address = <&art 0x6>;
-};

target/linux/ath79/dts/ar7242_ubnt_sw.dtsi

@@ -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 "ar7242.dtsi"
+
+/ {
+	compatible = "qca,ar7242";
+	model = "Ubiquiti Networks SW board";
+
+	chosen {
+		bootargs = "console=ttyS0,115200n8";
+	};
+
+	aliases {
+		led-boot = &led_usr;
+		led-failsafe = &led_usr;
+		led-running = &led_usr;
+		led-upgrade = &led_usr;
+	};
+
+	leds {
+		compatible = "gpio-leds";
+
+		led_usr: usr {
+			label = "ubnt:yellow:usr";
+			gpios = <&gpio 13 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	keys {
+		compatible = "gpio-keys";
+
+		reset {
+			linux,code = <KEY_RESTART>;
+			gpios = <&gpio 12 GPIO_ACTIVE_LOW>;
+			debounce-interval = <60>;
+		};
+	};
+
+	gpio_spi {
+		compatible = "spi-gpio";
+		#address-cells = <0x1>;
+		ranges;
+
+		sck-gpios = <&gpio 16 GPIO_ACTIVE_HIGH>;
+		mosi-gpios = <&gpio 15 GPIO_ACTIVE_HIGH>;
+		cs-gpios = <&gpio 14 GPIO_ACTIVE_HIGH>;
+		num-chipselects = <1>;
+
+		gpio_hc595: gpio_spi@0 {
+			compatible = "fairchild,74hc595";
+			reg = <0>;
+			registers-number = <2>;
+			spi-max-frequency = <100000>;
+			enable-gpios = <&gpio 7 GPIO_ACTIVE_HIGH>;
+
+			gpio-controller;
+			#gpio-cells = <2>;
+
+		};
+	};
+};
+
+&spi {
+	status = "okay";
+
+	num-cs = <1>;
+
+	flash@0 {
+		compatible = "jedec,spi-nor";
+		reg = <0>;
+		spi-max-frequency = <25000000>;
+
+		partitions {
+			compatible = "fixed-partitions";
+			#address-cells = <1>;
+			#size-cells = <1>;
+
+			partition@0 {
+				reg = <0x000000 0x040000>;
+				label = "u-boot";
+				read-only;
+			};
+
+			partition@40000 {
+				reg = <0x040000 0x010000>;
+				label = "u-boot-env";
+				read-only;
+			};
+
+			partition@50000 {
+				compatible = "denx,uimage";
+				reg = <0x050000 0x760000>;
+				label = "firmware";
+			};
+
+			partition@7b0000 {
+				reg = <0x7b0000 0x040000>;
+				label = "cfg";
+				read-only;
+			};
+
+			art: partition@7f0000 {
+				reg = <0x7f0000 0x010000>;
+				label = "art";
+				read-only;
+			};
+		};
+	};
+};
+
+&usb_phy {
+	status = "okay";
+};
+
+&usb {
+	#address-cells = <1>;
+	#size-cells = <0>;
+	status = "okay";
+
+	hub_port: port@1 {
+		reg = <1>;
+		#trigger-source-cells = <0>;
+	};
+};
+
+&pcie {
+	status = "okay";
+};
+
+&uart {
+	status = "okay";
+};
+
+&eth1 {
+	status = "okay";
+
+	mtd-mac-address = <&art 0x6>;
+};