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>

diff --git a/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-common.dtsi b/target/linux/ipq40xx/dts/qcom-ipq4029-meraki-common.dtsi
index 2e5d961eaec4da639f8759a7b5d5fefc37f57baa..1a7877aafec12fc4c90de756c7538186ce3da875 100644 (file)
--- 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 9c9f307219b4ef84107c703b54f13524d6915351..2b81e1f01bb0efd5762302caf13cfa132d657d52 100644 (file)
--- 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 3655238eb91d46a39501b5fe7cacb997ad6d5b43..5a14f8db2460bbb4d0002dd383bd3e0af4df6e8b 100644 (file)
--- 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>;
-
-                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>;
-                };
-
-        };
-};
+       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>;
+               };
 
-&tricolor {
-       enable-gpio = <&tlmm 48 GPIO_ACTIVE_HIGH>;
+               poeaf_det {
+                       gpio-export,name = "poeaf_det";
+                       gpio-export,input = <0>;
+                       gpios = <&tlmm 29 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 62a793cedb17c7b65f35bb5ca860598249397f1b..ee5914fd3d03106b8ae2a5bd7580c05bb8b92d43 100644 (file)
--- 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 09e71a65a8707d0284e7b8d0253f7c0f81708416..21e06df4cfe6e0819255aeb0852cb8570e235787 100644 (file)
--- 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 ea3b3ee75925c75a67e90fcbfbd86aa170a31985..eb3a1f260844a135e76bc70dd5645117eed2eeea 100644 (file)
--- 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";
 };