ipq40xx: underdog device tree update

Underdog devices lack a red LED, use the blue LED for
failsafe mode.

Move all config except device name to underdog.dtsi, as
all known underdog devices (MR20/GR10, MR70/GR60) have identical
device tree.

Signed-off-by: Hal Martin <hal.martin@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/22050
Signed-off-by: Robert Marko <robimarko@gmail.com>

2 files changed, 40 insertions, 51 deletions

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-underdog.dtsi b/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-underdog.dtsi
index 1c2fcdaa22..174b73279b 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-underdog.dtsi
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-underdog.dtsi
@@ -18,7 +18,7 @@
 / {
 	aliases {
 		led-boot = &status_green;
-		led-failsafe = &status_red;
+		led-failsafe = &status_blue;
 		led-running = &status_green;
 		led-upgrade = &power_orange;
 	};
@@ -32,6 +32,24 @@
 			gpios = <&tlmm 49 GPIO_ACTIVE_HIGH>;
 			panic-indicator;
 		};
+
+		status_green: led_green {
+			function = LED_FUNCTION_STATUS;
+			color = <LED_COLOR_ID_GREEN>;
+			gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
+		};
+
+		status_blue: led_blue {
+			function = LED_FUNCTION_STATUS;
+			color = <LED_COLOR_ID_BLUE>;
+			gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
+		};
+	};
+
+	soc {
+		ess_tcsr@1953000 {
+			qcom,ess-interface-select = <TCSR_ESS_PSGMII_RGMII5>;
+		};
 	};
 };
 
@@ -69,6 +87,11 @@
 	ethernet-phy-package@0 {
 		status = "disabled";
 	};
+
+	ar8035: ethernet-phy@0 {
+		compatible = "ethernet-phy-ieee802.3-c22";
+		reg = <0>;
+	};
 };
 
 &switch {
@@ -99,3 +122,19 @@
 	status = "disabled";
 };
 
+&swport5 {
+	status = "okay";
+	label = "lan";
+	phy-handle = <&ar8035>;
+	phy-mode = "rgmii-id";
+};
+
+&wifi0 {
+	status = "okay";
+	qcom,ath10k-calibration-variant = "Meraki-underdog";
+};
+
+&wifi1 {
+	status = "okay";
+	qcom,ath10k-calibration-variant = "Meraki-underdog";
+};
diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-mr20.dts b/target/linux/ipq40xx/dts/qcom-ipq4029-mr20.dts
index 9c50b10655..4824b9ac5a 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-mr20.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-mr20.dts
@@ -6,54 +6,4 @@
 / {
 	model = "Meraki MR20";
 	compatible = "meraki,mr20";
-
-	leds {
-		compatible = "gpio-leds";
-
-		status_green: led_green {
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&tlmm 34 GPIO_ACTIVE_HIGH>;
-		};
-
-		status_blue: led_blue {
-			color = <LED_COLOR_ID_BLUE>;
-			gpios = <&tlmm 35 GPIO_ACTIVE_HIGH>;
-		};
-
-		status_red: led_red {
-			color = <LED_COLOR_ID_RED>;
-			gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
-		};
-
-	};
-
-	soc {
-		ess_tcsr@1953000 {
-			qcom,ess-interface-select = <TCSR_ESS_PSGMII_RGMII5>;
-		};
-	};
-};
-
-&mdio {
-	ar8035: ethernet-phy@0 {
-		compatible = "ethernet-phy-ieee802.3-c22";
-		reg = <0>;
-	};
-};
-
-&swport5 {
-	status = "okay";
-	label = "lan";
-	phy-handle = <&ar8035>;
-	phy-mode = "rgmii-id";
-};
-
-&wifi0 {
-	status = "okay";
-	qcom,ath10k-calibration-variant = "Meraki-underdog";
-};
-
-&wifi1 {
-	status = "okay";
-	qcom,ath10k-calibration-variant = "Meraki-underdog";
 };