From 11d183654da5d399651aa0b6a82b91da56d281c8 Mon Sep 17 00:00:00 2001
From: suyuan <175338101@qq.com>
Date: Mon, 19 Sep 2022 01:56:26 +0800
Subject: [PATCH] Revert "Revert "Revert "Update qcom-ipq4019-z4019.dts"""

This reverts commit b8bcd6573a432576312186277841f472fee17463.
---
 .../arch/arm/boot/dts/qcom-ipq4019-z4019.dts  | 98 ++++++++-----------
 1 file changed, 42 insertions(+), 56 deletions(-)

diff --git a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-z4019.dts b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-z4019.dts
index e31df98b..577e40ee 100755
--- a/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-z4019.dts
+++ b/root/target/linux/ipq40xx/files/arch/arm/boot/dts/qcom-ipq4019-z4019.dts
@@ -122,8 +122,11 @@
 
 	leds {
 		compatible = "gpio-leds";
-		pinctrl-0 = <&led_pins>;
-		pinctrl-names = "default";
+
+		power: power {
+			label = "green:power";
+			gpios = <&tlmm 36 GPIO_ACTIVE_LOW>;
+		};
 
 		wifi0 {
 			label = "green:wlan0";
@@ -135,8 +138,8 @@
 			gpios = <&tlmm 42 GPIO_ACTIVE_LOW>;
 		};
 
-		4g1 {
-			label = "green:4g1";
+		4g {
+			label = "green:4g";
 			gpios = <&tlmm 1 GPIO_ACTIVE_LOW>;
 		};
 
@@ -150,23 +153,27 @@
 			gpios = <&tlmm 4 GPIO_ACTIVE_LOW>;
 		};
 
-		4g1pwr {
-			label = "green:4g1pwr";
-			gpios = <&tlmm 20 GPIO_ACTIVE_HIGH>;
+		4gpwr {
+			label = "green:4gpwr";
+			gpios = <&tlmm 20 GPIO_ACTIVE_LOW>;
 		};
 
 		4g2pwr {
 			label = "green:4g2pwr";
-			gpios = <&tlmm 8 GPIO_ACTIVE_HIGH>;
+			gpios = <&tlmm 8 GPIO_ACTIVE_LOW>;
 		};
 
 		4g3pwr {
 			label = "green:4g3pwr";
-			gpios = <&tlmm 9 GPIO_ACTIVE_HIGH>;
+			gpios = <&tlmm 9 GPIO_ACTIVE_LOW>;
 		};
-	};
 
-	watchdog {
+		4g2sim {
+			label = "green:4g2sim";
+			gpios = <&tlmm 0 GPIO_ACTIVE_LOW>;
+		};
+
+		watchdog {
 		compatible = "linux,wdt-gpio";
 		gpios = <&tlmm 11 GPIO_ACTIVE_LOW>;
 		hw_algo = "toggle";
@@ -297,68 +304,47 @@
 		};
 	};
 
-	led_pins: led_pins {
-		wifi1 {
-			pins = "gpio42";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
 
-		wifi2 {
-			pins = "gpio43";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		4g1 {
-			pins = "gpio1";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		4g2 {
-			pins = "gpio2";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-		4g3 {
-			pins = "gpio4";
-			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
-		};
-
-
-		power_4g1 {
+	power_4g_pinmux {
+		mux {
 			pins = "gpio20";
 			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
+			drive-strength = <12>;
+			bias-pull-down;
 			output-high;
 		};
+	};
 
-		power_4g2 {
+	power_4g2_pinmux {
+		mux {
 			pins = "gpio8";
 			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
+			drive-strength = <12>;
+			bias-pull-down;
 			output-high;
 		};
+	};
 
-		power_4g3 {
+	power_4g3_pinmux {
+		mux {
 			pins = "gpio9";
 			function = "gpio";
-			drive-strength = <8>;
-			bias-pull-up;
+			drive-strength = <12>;
+			bias-pull-down;
 			output-high;
 		};
 	};
 
+	power_sim_sw_pinmux {
+		mux {
+			pins = "gpio0";
+			function = "gpio";
+			drive-strength = <12>;
+			bias-disable;
+			output-low;
+		};
+	};
+
 	spi_0_pins: spi_0_pinmux {
 		pinmux {
 			function = "blsp_spi0";