From 8ac6c7a54ed1b98d142dce24b11c6de6a1e239a5 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Tue, 22 Oct 2024 10:36:11 +0000
Subject: [PATCH] 修改4g拨号为QMI,需要在系统里后台执行quectel-CM

---
 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi |  159 ++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 102 insertions(+), 57 deletions(-)

diff --git a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
index 3135b2f..aabaeba 100755
--- a/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
+++ b/kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
@@ -34,15 +34,6 @@
 		vin-supply = <&vcc3v3_sys>;
 	};
 
-	vcc3v3_vga: vcc3v3-vga {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3_vga";
-		regulator-always-on;
-		regulator-boot-on;
-		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
-		enable-active-high;
-		vin-supply = <&vcc3v3_sys>;
-	};
 
 	pcie30_avdd0v9: pcie30-avdd0v9 {
 		compatible = "regulator-fixed";
@@ -98,6 +89,25 @@
 		regulator-boot-on;
     	};
 #endif
+
+#if 0
+		leds: leds {
+		compatible = "gpio-leds";
+		sig_led: sig_led {
+			gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
+			default-state = "on";
+		};
+	};
+	
+		leds: leds {
+		compatible = "gpio-leds";	
+		err_led: err_led {
+			gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
+			default-state = "on";
+		};
+	};
+#endif
+
 	ndj_io_init {
          	compatible = "nk_io_control";	
 			pinctrl-names = "default";
@@ -115,16 +125,26 @@
 				gpio_function = <0>;
 			};
 			
-			hub_host2_rst {
-				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
+			vcc_3.3v {
+				gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
+				gpio_function = <0>;
+			};
+			
+			ax88772_rst {
+				gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B5_3V3
 				gpio_function = <3>;
 			};
 			
+			ax88631_rst {
+				gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B6_3V3
+				gpio_function = <3>;
+			};
+/*
 			hub_host3 {
 				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
 				gpio_function = <0>;
 			};
-			
+*/			
 			wake_4g {
 				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
 				gpio_function = <0>;
@@ -145,10 +165,10 @@
 				gpio_function = <0>;
 			};
 			
-			hp_en {
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
-				gpio_function = <0>;
-			};
+			//gpio99 {
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
+			//	gpio_function = <1>;
+			//};
 			
 			wifi_power_en {
 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
@@ -235,8 +255,8 @@
 				nodka-lvds = <15>;
 
 				display-timings {
-                native-mode = <&timing0>;
-                timing0: timing0 {
+                native-mode = <&timing>;
+                timing: timing {
 					clock-frequency = <72500000>;
 					hactive = <1280>;
 					vactive = <800>;
@@ -253,8 +273,8 @@
 					};
 				};
 				ports {
-					panel_in: endpoint {
-					remote-endpoint = <&edp_out>;
+					panel_in_lvds: endpoint {
+					remote-endpoint = <&lvds_out>;
 						};
 					};   
 				};
@@ -346,7 +366,7 @@
  */
  
 &video_phy1 {
-	status = "okay";
+	status = "disabled";
 }; 
 &dsi1 {
 	status = "disabled";
@@ -357,11 +377,11 @@
 };
 
 &dsi1_in_vp1 {
-	status = "okay";
+	status = "disabled";
 };
 
 &dsi1_panel {
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
     vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
     reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
     vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
@@ -381,20 +401,11 @@
 
 &edp {
     force-hpd;
-    status = "okay";
-    ports {
-        port@1 {
-            reg = <1>;
-            edp_out: endpoint {
-                remote-endpoint = <&panel_in>;
-            };
-        };
-   
-	};
+	status = "disabled";
 };
 
 &edp_phy {
-	status = "okay";
+	status = "disabled";
 };
 
 &edp_in_vp0 {
@@ -402,18 +413,40 @@
 };
 
 &edp_in_vp1 {
-    status = "okay";
+    status = "disabled";
 
 };
 
 &route_edp {
-    status = "okay";
+    status = "disabled";
     connect = <&vp1_out_edp>;
 };
 
 &route_edp {
-	status = "okay";
+	status = "disabled";
 };
+
+&lvds {
+	status = "disabled";
+	ports {
+		port@1 {
+			reg = <1>;
+			lvds_out:endpoint {
+				remote-endpoint = <&panel_in_lvds>;
+			};
+		};
+	};
+};
+
+&route_lvds{
+	status = "okay";
+	connect = <&vp1_out_lvds>;
+};
+
+&lvds_in_vp1 {
+	status = "disabled";
+};
+
 /*
 *  edp_end
 */
@@ -631,7 +664,7 @@
 
 
 &pcie30phy {
-	status = "okay";
+	status = "disabled";
 };
 
 &pcie2x1 {
@@ -690,12 +723,27 @@
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
+							<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
+							<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
-							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
-							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
-							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
-							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
-							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
+							<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3  DO1 8
+							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3  DO2 11
+							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3  DO3 12
+							<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3  DO4 13
+							<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3  DO5 14
+							
+							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3  DI1 16
+							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3  DI2 17
+							<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3  DI3 18
+							<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3  DI4 19
+							<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3  DI5 21
+							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>,
+							<4 RK_PC4 RK_FUNC_GPIO &pcfg_pull_none>, //sig_led
+							<4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>, //err_led
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>, //run_led
+							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>; //HOST3_EN_GPIO4_B2_1V8
+
 		};
 	};
 };
@@ -760,15 +808,6 @@
 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
 };
 
-&vcc3v3_lcd0_n {
-	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
-	enable-active-high;
-};
-
-&vcc3v3_lcd1_n {
-	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
-	enable-active-high;
-};
 
 &wireless_wlan {
 	pinctrl-names = "default";
@@ -788,17 +827,17 @@
 	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
     BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
     BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
-	status = "okay";
+	status = "disabled";
 };
 
 &uart0 {
-	status = "okay";
+	status = "disabled";
 };
 
 &uart1 {	
 	pinctrl-names = "default";	
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
-	status = "okay";		
+	status = "disabled";		
 };
 
 &uart3 {
@@ -807,7 +846,7 @@
 };
 
 &uart4 {
-	status = "okay";
+	status = "disabled";
 	pinctrl-0 = <&uart4m1_xfer>;
 };
 
@@ -816,12 +855,18 @@
 	pinctrl-0 = <&uart5m1_xfer>;
 };
 
+
 &uart7 {
 	status = "okay";
 	pinctrl-0 = <&uart7m1_xfer>;
 };
 
+&uart8 {
+	status = "disabled";
+	pinctrl-0 = <&uart8m1_xfer>;
+};
+
 &uart9 {
-	status = "okay";
+	status = "disabled";
 	pinctrl-0 = <&uart9m1_xfer>;
 };

--
Gitblit v1.6.2