ipq40xx: ZTE MF287 series: move to gpio-export for modem-reset GPIO

Turn the "gpio-restart" node into a "gpio-export" node for all MF287
variants, similar to the MF287 Pro. Unfortunately, there doesn't seem to be
a "power button blocker" GPIO for the MF287 and MF287 Plus, so a modem
reset always triggers a system reset.

Signed-off-by: Andreas Böhler <dev@aboehler.at>
(cherry picked from commit 053f8f92d1395fa5d33b0b8f2fef44a4b926c112)

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts
index 722f25053d23988255e17557a9b15eb4e4d2b509..43e39bdf960017cfd2432c1b39c60f09ac7238e9 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287.dts
@@ -8,15 +8,10 @@
 / {
        model = "ZTE MF287";
        compatible = "zte,mf287";
+};
 
-       /*
-        * This node is used to restart modem module to avoid anomalous
-        * behaviours on initial communication.
-        */
-       gpio-restart {
-               compatible = "gpio-restart";
-               gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
-       };
+&gpio_modem_reset {
+       gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
 };
 
 &key_reset {

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
index dcb4915ae00a61f12c768344e00e3690658f1fe5..52272434679cbff1cfb416810af37c30b3a7f3e3 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287_common.dtsi
@@ -35,6 +35,16 @@
                };
        };
 
+       gpio_export {
+               compatible = "gpio-export";
+               #size-cells = <0>;
+
+               gpio_modem_reset: modem {
+                       gpio-export,name = "modem-reset";
+                       gpio-export,output = <0>;
+               };
+       };
+
        keys {
                compatible = "gpio-keys";
 

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts
index b5f386fa4bbd9c3e0282048ed1afb099f5fb1427..f09a77ff59f985c93a45cdb3a2e5aee5679cbf8e 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287plus.dts
@@ -8,15 +8,10 @@
 / {
        model = "ZTE MF287Plus";
        compatible = "zte,mf287plus";
+};
 
-       /*
-        * This node is used to restart modem module to avoid anomalous
-        * behaviours on initial communication.
-        */
-       gpio-restart {
-               compatible = "gpio-restart";
-               gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
-       };
+&gpio_modem_reset {
+       gpios = <&tlmm 5 GPIO_ACTIVE_HIGH>;
 };
 
 &key_reset {

diff --git a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts
index 0af7b0426b371b5e7d064a93e433adfd59c82fab..4fd44989c5eddca68992160dfc5ffd6b3b27207d 100644 (file)
--- a/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts
+++ b/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4018-mf287pro.dts
@@ -9,17 +9,6 @@
        model = "ZTE MF287Pro";
        compatible = "zte,mf287pro";
 
-       gpio_export {
-               compatible = "gpio-export";
-               #size-cells = <0>;
-
-               modem {
-                       gpio-export,name = "modem-reset";
-                       gpio-export,output = <0>;
-                       gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
-               };
-       };
-
        regulator-usb-vbus {
                compatible = "regulator-fixed";
                regulator-name = "USB_VBUS";
@@ -31,6 +20,10 @@
        };
 };
 
+&gpio_modem_reset {
+       gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
+};
+
 &key_reset {
        gpios = <&tlmm 18 GPIO_ACTIVE_LOW>;
 };