forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-09-20 a36159eec6ca17402b0e146b86efaf76568dc353 
 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
....@@ -34,15 +34,6 @@
3434 		vin-supply = <&vcc3v3_sys>;
3535 	};
3636 
37
-	vcc3v3_vga: vcc3v3-vga {
38
-		compatible = "regulator-fixed";
39
-		regulator-name = "vcc3v3_vga";
40
-		regulator-always-on;
41
-		regulator-boot-on;
42
-		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
43
-		enable-active-high;
44
-		vin-supply = <&vcc3v3_sys>;
45
-	};
4637 
4738 	pcie30_avdd0v9: pcie30-avdd0v9 {
4839 		compatible = "regulator-fixed";
....@@ -98,6 +89,24 @@
9889 		regulator-boot-on;
9990     	};
10091 #endif
92
+
93
+		leds: leds {
94
+		compatible = "gpio-leds";
95
+		sig_led: sig_led {
96
+			gpios = <&gpio4 RK_PC4 GPIO_ACTIVE_HIGH>;
97
+			default-state = "on";
98
+		};
99
+	};
100
+	
101
+		leds: leds {
102
+		compatible = "gpio-leds";	
103
+		err_led: err_led {
104
+			gpios = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;
105
+			default-state = "on";
106
+		};
107
+	};
108
+
109
+
101110 	ndj_io_init {
102111          	compatible = "nk_io_control";	
103112 			pinctrl-names = "default";
....@@ -115,8 +124,18 @@
115124 				gpio_function = <0>;
116125 			};
117126 			
118
-			hub_host2_rst {
119
-				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
127
+			vcc_3.3v {
128
+				gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
129
+				gpio_function = <0>;
130
+			};
131
+			
132
+			ax88772_rst {
133
+				gpio_num = <&gpio3 RK_PB5 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B5_3V3
134
+				gpio_function = <3>;
135
+			};
136
+			
137
+			ax88631_rst {
138
+				gpio_num = <&gpio3 RK_PB6 GPIO_ACTIVE_HIGH>;  //AX88772_RST_GPIO3_B6_3V3
120139 				gpio_function = <3>;
121140 			};
122141 			
....@@ -145,10 +164,10 @@
145164 				gpio_function = <0>;
146165 			};
147166 			
148
-			hp_en {
149
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
150
-				gpio_function = <0>;
151
-			};
167
+			//gpio99 {
168
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
169
+			//	gpio_function = <1>;
170
+			//};
152171 			
153172 			wifi_power_en {
154173 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
....@@ -235,8 +254,8 @@
235254 				nodka-lvds = <15>;
236255 
237256 				display-timings {
238
-                native-mode = <&timing0>;
239
-                timing0: timing0 {
257
+                native-mode = <&timing>;
258
+                timing: timing {
240259 					clock-frequency = <72500000>;
241260 					hactive = <1280>;
242261 					vactive = <800>;
....@@ -253,8 +272,8 @@
253272 					};
254273 				};
255274 				ports {
256
-					panel_in: endpoint {
257
-					remote-endpoint = <&edp_out>;
275
+					panel_in_lvds: endpoint {
276
+					remote-endpoint = <&lvds_out>;
258277 						};
259278 					};   
260279 				};
....@@ -346,7 +365,7 @@
346365  */
347366  
348367 &video_phy1 {
349
-	status = "okay";
368
+	status = "disabled";
350369 }; 
351370 &dsi1 {
352371 	status = "disabled";
....@@ -357,11 +376,11 @@
357376 };
358377 
359378 &dsi1_in_vp1 {
360
-	status = "okay";
379
+	status = "disabled";
361380 };
362381 
363382 &dsi1_panel {
364
-	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
383
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
365384     vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
366385     reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
367386     vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
....@@ -381,20 +400,11 @@
381400 
382401 &edp {
383402     force-hpd;
384
-    status = "okay";
385
-    ports {
386
-        port@1 {
387
-            reg = <1>;
388
-            edp_out: endpoint {
389
-                remote-endpoint = <&panel_in>;
390
-            };
391
-        };
392
-   
393
-	};
403
+	status = "disabled";
394404 };
395405 
396406 &edp_phy {
397
-	status = "okay";
407
+	status = "disabled";
398408 };
399409 
400410 &edp_in_vp0 {
....@@ -402,18 +412,40 @@
402412 };
403413 
404414 &edp_in_vp1 {
405
-    status = "okay";
415
+    status = "disabled";
406416 
407417 };
408418 
409419 &route_edp {
410
-    status = "okay";
420
+    status = "disabled";
411421     connect = <&vp1_out_edp>;
412422 };
413423 
414424 &route_edp {
415
-	status = "okay";
425
+	status = "disabled";
416426 };
427
+
428
+&lvds {
429
+	status = "disabled";
430
+	ports {
431
+		port@1 {
432
+			reg = <1>;
433
+			lvds_out:endpoint {
434
+				remote-endpoint = <&panel_in_lvds>;
435
+			};
436
+		};
437
+	};
438
+};
439
+
440
+&route_lvds{
441
+	status = "okay";
442
+	connect = <&vp1_out_lvds>;
443
+};
444
+
445
+&lvds_in_vp1 {
446
+	status = "disabled";
447
+};
448
+
417449 /*
418450 *  edp_end
419451 */
....@@ -631,7 +663,7 @@
631663 
632664 
633665 &pcie30phy {
634
-	status = "okay";
666
+	status = "disabled";
635667 };
636668 
637669 &pcie2x1 {
....@@ -690,11 +722,21 @@
690722 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
691723 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
692724 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
725
+							<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
726
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
727
+							<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
693728 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
694
-							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
695
-							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
696
-							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
697
-							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
729
+							<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3  DO1 8
730
+							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3  DO2 11
731
+							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3  DO3 12
732
+							<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3  DO4 13
733
+							<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3  DO5 14
734
+							
735
+							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3  DI1 16
736
+							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3  DI2 17
737
+							<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3  DI3 18
738
+							<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3  DI4 19
739
+							<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3  DI5 21
698740 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
699741 		};
700742 	};
....@@ -760,15 +802,6 @@
760802 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
761803 };
762804 
763
-&vcc3v3_lcd0_n {
764
-	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
765
-	enable-active-high;
766
-};
767
-
768
-&vcc3v3_lcd1_n {
769
-	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
770
-	enable-active-high;
771
-};
772805 
773806 &wireless_wlan {
774807 	pinctrl-names = "default";
....@@ -788,17 +821,17 @@
788821 	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
789822     BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
790823     BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
791
-	status = "okay";
824
+	status = "disabled";
792825 };
793826 
794827 &uart0 {
795
-	status = "okay";
828
+	status = "disabled";
796829 };
797830 
798831 &uart1 {	
799832 	pinctrl-names = "default";	
800833 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
801
-	status = "okay";		
834
+	status = "disabled";		
802835 };
803836 
804837 &uart3 {
....@@ -807,7 +840,7 @@
807840 };
808841 
809842 &uart4 {
810
-	status = "okay";
843
+	status = "disabled";
811844 	pinctrl-0 = <&uart4m1_xfer>;
812845 };
813846 
....@@ -816,12 +849,18 @@
816849 	pinctrl-0 = <&uart5m1_xfer>;
817850 };
818851 
852
+
819853 &uart7 {
820854 	status = "okay";
821855 	pinctrl-0 = <&uart7m1_xfer>;
822856 };
823857 
858
+&uart8 {
859
+	status = "disabled";
860
+	pinctrl-0 = <&uart8m1_xfer>;
861
+};
862
+
824863 &uart9 {
825
-	status = "okay";
864
+	status = "disabled";
826865 	pinctrl-0 = <&uart9m1_xfer>;
827866 };