Browse Source

ath79: create DTSI files for ubnt WA 1-/2-port devices

The ar9342 Ubiquiti WA devices appear to only have two different
network setups, based on the number of ethernet ports.
Create DTSI files for them to consolidate duplicate definitions.

Signed-off-by: Nick Hainke <[email protected]>
[rephrase commit message/title]
Signed-off-by: Adrian Schmutzler <[email protected]>
Nick Hainke 5 years ago
parent
commit
28a211808a

+ 1 - 28
target/linux/ath79/dts/ar9342_ubnt_lap-120.dts

@@ -1,39 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "ar9342_ubnt_wa.dtsi"
+#include "ar9342_ubnt_wa_1port.dtsi"
 
 / {
 	compatible = "ubnt,lap-120", "ubnt,wa", "qca,ar9342";
 	model = "Ubiquiti LiteAP ac (LAP-120)";
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy-mask = <4>;
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	/* default for ar934x, except for 1000M and 10M */
-	pll-data = <0x02000000 0x00000101 0x00001313>;
-
-	mtd-mac-address = <&art 0x0>;
-
-	phy-mode = "rgmii-id";
-	phy-handle = <&phy4>;
-
-	gmac-config {
-		device = <&gmac>;
-		rxd-delay = <3>;
-		rxdv-delay = <3>;
-	};
-};
-
 &wmac {
 	status = "disabled";
 };

+ 1 - 28
target/linux/ath79/dts/ar9342_ubnt_litebeam-ac-gen2.dts

@@ -1,39 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "ar9342_ubnt_wa.dtsi"
+#include "ar9342_ubnt_wa_1port.dtsi"
 
 / {
 	compatible = "ubnt,litebeam-ac-gen2", "ubnt,wa", "qca,ar9342";
 	model = "Ubiquiti LiteBeam AC Gen2";
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy-mask = <4>;
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	/* default for ar934x, except for 1000M and 10M */
-	pll-data = <0x02000000 0x00000101 0x00001313>;
-
-	mtd-mac-address = <&art 0x0>;
-
-	phy-mode = "rgmii-id";
-	phy-handle = <&phy4>;
-
-	gmac-config {
-		device = <&gmac>;
-		rxd-delay = <3>;
-		rxdv-delay = <3>;
-	};
-};
-
 &wmac {
 	status = "okay";
 

+ 1 - 28
target/linux/ath79/dts/ar9342_ubnt_nanobeam-ac.dts

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "ar9342_ubnt_wa.dtsi"
+#include "ar9342_ubnt_wa_1port.dtsi"
 
 / {
 	compatible = "ubnt,nanobeam-ac", "ubnt,wa", "qca,ar9342";
@@ -36,30 +36,3 @@
 		};
 	};
 };
-
-&mdio0 {
-	status = "okay";
-
-	phy-mask = <4>;
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	/* default for ar934x, except for 1000M and 10M */
-	pll-data = <0x02000000 0x00000101 0x00001313>;
-
-	mtd-mac-address = <&art 0x0>;
-
-	phy-mode = "rgmii-id";
-	phy-handle = <&phy4>;
-
-	gmac-config {
-		device = <&gmac>;
-		rxd-delay = <3>;
-		rxdv-delay = <3>;
-	};
-};

+ 1 - 28
target/linux/ath79/dts/ar9342_ubnt_nanostation-ac-loco.dts

@@ -1,39 +1,12 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "ar9342_ubnt_wa.dtsi"
+#include "ar9342_ubnt_wa_1port.dtsi"
 
 / {
 	compatible = "ubnt,nanostation-ac-loco", "ubnt,wa", "qca,ar9342";
 	model = "Ubiquiti Nanostation AC loco (WA)";
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy-mask = <4>;
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	/* default for ar934x, except for 1000M and 10M */
-	pll-data = <0x02000000 0x00000101 0x00001313>;
-
-	mtd-mac-address = <&art 0x0>;
-
-	phy-mode = "rgmii-id";
-	phy-handle = <&phy4>;
-
-	gmac-config {
-		device = <&gmac>;
-		rxd-delay = <3>;
-		rxdv-delay = <3>;
-	};
-};
-
 &wmac {
 	status = "okay";
 

+ 1 - 36
target/linux/ath79/dts/ar9342_ubnt_nanostation-ac.dts

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "ar9342_ubnt_wa.dtsi"
+#include "ar9342_ubnt_wa_2port.dtsi"
 
 / {
 	compatible = "ubnt,nanostation-ac","ubnt,wa", "qca,ar9342";
@@ -37,41 +37,6 @@
 	};
 };
 
-&mdio0 {
-	status = "okay";
-
-	phy-mask = <4>;
-	phy0: ethernet-phy@0 {
-		phy-mode = "rgmii";
-		reg = <0>;
-
-		qca,ar8327-initvals = <
-			0x04 0x07600000 /* PORT0 PAD MODE CTRL */
-			0x58 0xffb7ffb7 /* LED_CTRL2 */
-			0x5c 0x03ffff00 /* LED_CTRL3 */
-			0x7c 0x0000007e /* PORT0_STATUS */
-		>;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	/* default for ar934x, except for 1000M and 10M */
-	pll-data = <0x06000000 0x00000101 0x00001313>;
-
-	mtd-mac-address = <&art 0x0>;
-
-	phy-mode = "rgmii";
-	phy-handle = <&phy0>;
-
-	gmac-config {
-		device = <&gmac>;
-		rxd-delay = <2>;
-		rxdv-delay = <2>;
-	};
-};
-
 &wmac {
 	status = "okay";
 

+ 1 - 28
target/linux/ath79/dts/ar9342_ubnt_powerbeam-5ac-gen2.dts

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 
-#include "ar9342_ubnt_wa.dtsi"
+#include "ar9342_ubnt_wa_1port.dtsi"
 
 / {
 	compatible = "ubnt,powerbeam-5ac-gen2", "ubnt,wa", "qca,ar9342";
@@ -36,30 +36,3 @@
 		};
 	};
 };
-
-&mdio0 {
-	status = "okay";
-
-	phy-mask = <4>;
-	phy4: ethernet-phy@4 {
-		reg = <4>;
-	};
-};
-
-&eth0 {
-	status = "okay";
-
-	/* default for ar934x, except for 1000M and 10M */
-	pll-data = <0x02000000 0x00000101 0x00001313>;
-
-	mtd-mac-address = <&art 0x0>;
-
-	phy-mode = "rgmii-id";
-	phy-handle = <&phy4>;
-
-	gmac-config {
-		device = <&gmac>;
-		rxd-delay = <3>;
-		rxdv-delay = <3>;
-	};
-};

+ 31 - 0
target/linux/ath79/dts/ar9342_ubnt_wa_1port.dtsi

@@ -0,0 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "ar9342_ubnt_wa.dtsi"
+
+&mdio0 {
+	status = "okay";
+
+	phy-mask = <4>;
+
+	phy4: ethernet-phy@4 {
+		reg = <4>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	/* default for ar934x, except for 1000M and 10M */
+	pll-data = <0x02000000 0x00000101 0x00001313>;
+
+	mtd-mac-address = <&art 0x0>;
+
+	phy-mode = "rgmii-id";
+	phy-handle = <&phy4>;
+
+	gmac-config {
+		device = <&gmac>;
+		rxd-delay = <3>;
+		rxdv-delay = <3>;
+	};
+};

+ 39 - 0
target/linux/ath79/dts/ar9342_ubnt_wa_2port.dtsi

@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+#include "ar9342_ubnt_wa.dtsi"
+
+&mdio0 {
+	status = "okay";
+
+	phy-mask = <4>;
+
+	phy0: ethernet-phy@0 {
+		phy-mode = "rgmii";
+		reg = <0>;
+
+		qca,ar8327-initvals = <
+			0x04 0x07600000 /* PORT0 PAD MODE CTRL */
+			0x58 0xffb7ffb7 /* LED_CTRL2 */
+			0x5c 0x03ffff00 /* LED_CTRL3 */
+			0x7c 0x0000007e /* PORT0_STATUS */
+		>;
+	};
+};
+
+&eth0 {
+	status = "okay";
+
+	/* default for ar934x, except for 1000M and 10M */
+	pll-data = <0x06000000 0x00000101 0x00001313>;
+
+	mtd-mac-address = <&art 0x0>;
+
+	phy-mode = "rgmii";
+	phy-handle = <&phy0>;
+
+	gmac-config {
+		device = <&gmac>;
+		rxd-delay = <2>;
+		rxdv-delay = <2>;
+	};
+};