From 3a8734b1f7f116aae8cf72edf401b8e73ce734b0 Mon Sep 17 00:00:00 2001
From: Hal Martin <hal.martin@gmail.com>
Date: Tue, 12 May 2026 18:12:47 +0200
Subject: [PATCH] ipq40xx: fixup Meraki device trees

Fix small nits in the Meraki device trees, identified by Claude
during a new device PR.

Signed-off-by: Hal Martin <hal.martin@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/23307
Signed-off-by: Robert Marko <robimarko@gmail.com>
---
 .../dts/qcom-ipq4029-meraki-common.dtsi       | 18 ++++-------
 .../dts/qcom-ipq4029-meraki-insect.dtsi       |  1 +
 .../linux/ipq40xx/dts/qcom-ipq4029-mr30h.dts  | 32 ++++++++-----------
 .../linux/ipq40xx/dts/qcom-ipq4029-mr33.dts   |  4 ---
 .../linux/ipq40xx/dts/qcom-ipq4029-mr74.dts   |  4 ---
 target/linux/ipq40xx/dts/qcom-ipq4029-z3.dts  |  4 ---
 6 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-common.dtsi b/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-common.dtsi
index 2e5d961eae..1a7877aafe 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-common.dtsi
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-common.dtsi
@@ -219,20 +219,16 @@
 	};
 
 	serial_0_pins: serial_pinmux {
-		mux {
-			pins = "gpio16", "gpio17";
-			function = "blsp_uart0";
-			bias-disable;
-		};
+		pins = "gpio16", "gpio17";
+		function = "blsp_uart0";
+		bias-disable;
 	};
 
 	serial_1_pins: serial1_pinmux {
-		mux {
-			/* We use the i2c-0 pins for serial_1 */
-			pins = "gpio8", "gpio9";
-			function = "blsp_uart1";
-			bias-disable;
-		};
+		/* We use the i2c-0 pins for serial_1 */
+		pins = "gpio8", "gpio9";
+		function = "blsp_uart1";
+		bias-disable;
 	};
 
 	i2c_0_pins: i2c_0_pinmux {
diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-insect.dtsi b/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-insect.dtsi
index 9c9f307219..2b81e1f01b 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-insect.dtsi
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-insect.dtsi
@@ -65,6 +65,7 @@
 		compatible = "ti,lp5562";
 		reg = <0x30>;
 		clock-mode = /bits/8 <2>;
+		enable-gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;
 		#address-cells = <1>;
 		#size-cells = <0>;
 
diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-mr30h.dts b/target/linux/ipq40xx/dts/qcom-ipq4029-mr30h.dts
index 3655238eb9..5a14f8db24 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-mr30h.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-mr30h.dts
@@ -80,27 +80,23 @@
 		};
 	};
 
-        gpio_export {
-                compatible = "gpio-export";
-                #size-cells = <0>;
+	gpio_export {
+		compatible = "gpio-export";
+		#size-cells = <0>;
 
-                pse_en {
-                        gpio-export,name = "pse_en";
-                        gpio-export,output = <1>;
-                        gpios = <&tlmm 28 GPIO_ACTIVE_LOW>;
-                };
+		pse_en {
+			gpio-export,name = "pse_en";
+			gpio-export,output = <1>;
+			gpios = <&tlmm 28 GPIO_ACTIVE_LOW>;
+		};
 
-                poeaf_det {
-                        gpio-export,name = "poeaf_det";
-                        gpio-export,input = <0>;
-                        gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>;
-                };
+		poeaf_det {
+			gpio-export,name = "poeaf_det";
+			gpio-export,input = <0>;
+			gpios = <&tlmm 29 GPIO_ACTIVE_HIGH>;
+		};
 
-        };
-};
-
-&tricolor {
-	enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
+	};
 };
 
 &pcie0 {
diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-mr33.dts b/target/linux/ipq40xx/dts/qcom-ipq4029-mr33.dts
index 62a793cedb..ee5914fd3d 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-mr33.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-mr33.dts
@@ -14,10 +14,6 @@
 	};
 };
 
-&tricolor {
-	enable-gpios = <&tlmm 48 GPIO_ACTIVE_HIGH>;
-};
-
 &pcie0 {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-mr74.dts b/target/linux/ipq40xx/dts/qcom-ipq4029-mr74.dts
index 09e71a65a8..21e06df4cf 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-mr74.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-mr74.dts
@@ -14,10 +14,6 @@
 	};
 };
 
-&tricolor {
-	enable-gpios = <&tlmm 14 GPIO_ACTIVE_LOW>;
-};
-
 &pcie0 {
 	status = "okay";
 };
diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-z3.dts b/target/linux/ipq40xx/dts/qcom-ipq4029-z3.dts
index ea3b3ee759..eb3a1f2608 100644
--- a/target/linux/ipq40xx/dts/qcom-ipq4029-z3.dts
+++ b/target/linux/ipq40xx/dts/qcom-ipq4029-z3.dts
@@ -113,10 +113,6 @@
 	};
 };
 
-&tricolor {
-	enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
-};
-
 &usb2_hs_phy {
 	status = "okay";
 };