forked from ~ljy/RK356X_SDK_RELEASE
blame | history | patch | commit | commitdiff
hc
2024-05-10 61598093bbdd283a7edc367d900f223070ead8d2 
 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";
....@@ -69,7 +60,9 @@
6960 		regulator-name = "vcc3v3_pcie";
7061 		regulator-min-microvolt = <3300000>;
7162 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
7264 		enable-active-high;
65
+		regulator-boot-on;
7366 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
7467 		startup-delay-us = <5000>;
7568 		vin-supply = <&dc_12v>;
....@@ -96,6 +89,24 @@
9689 		regulator-boot-on;
9790     	};
9891 #endif
92
+
93
+		leds: leds {
94
+		compatible = "gpio-leds";
95
+		sig_led: sig_led {
96
+			gpios = <&gpio4 RK_PC3 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
+
99110 	ndj_io_init {
100111          	compatible = "nk_io_control";	
101112 			pinctrl-names = "default";
....@@ -110,6 +121,11 @@
110121 			
111122 			vcc_12v {
112123 				gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;  //VCC12_IO_EN_GPIO0_C7_3V3
124
+				gpio_function = <0>;
125
+			};
126
+			
127
+			vcc_3.3v {
128
+				gpio_num = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
113129 				gpio_function = <0>;
114130 			};
115131 			
....@@ -143,22 +159,15 @@
143159 				gpio_function = <0>;
144160 			};
145161 			
146
-			hp_en {
147
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
162
+			//gpio99 {
163
+			//	gpio_num = <&gpio3 RK_PA3 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
164
+			//	gpio_function = <1>;
165
+			//};
166
+			
167
+			wifi_power_en {
168
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
148169 				gpio_function = <0>;
149170 			};
150
-			
151
-			usb_ogt {
152
-				gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
153
-				gpio_function = <0>;
154
-			};
155
-			
156
-			m2_wifi_pwr {
157
-				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;//WIFI_PWREN_GPIO3_C6_1V8
158
-				gpio_function = <0>;
159
-			};
160
-			
161
-			 
162171 	#if 0		
163172 			do1 {
164173 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
....@@ -225,8 +234,9 @@
225234 				compatible = "simple-panel";
226235 				backlight = <&backlight>;
227236 				power-supply = <&vcc3v3_lcd0_n>;
228
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
229
-				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
237
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
238
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
239
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
230240 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
231241 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
232242 				bpc = <8>;
....@@ -256,7 +266,7 @@
256266 					pixelclk-active = <0>;			
257267 					};
258268 				};
259
-				port {
269
+				ports {
260270 					panel_in_lvds: endpoint {
261271 					remote-endpoint = <&lvds_out>;
262272 						};
....@@ -348,6 +358,10 @@
348358  * video_phy1 needs to be enabled
349359  * when dsi1 is enabled
350360  */
361
+ 
362
+&video_phy1 {
363
+	status = "disabled";
364
+}; 
351365 &dsi1 {
352366 	status = "disabled";
353367 };
....@@ -361,39 +375,31 @@
361375 };
362376 
363377 &dsi1_panel {
364
-	power-supply = <&vcc3v3_lcd1_n>;
378
+//	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
379
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
380
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
381
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
382
+    pinctrl-names = "default";
383
+    pinctrl-0 = <&lcd1_rst_gpio>;
365384 };
385
+
386
+&route_dsi1 {
387
+	status = "disabled";
388
+	connect = <&vp1_out_dsi1>;
389
+};
390
+
391
+
392
+/*
393
+*  edp_start
394
+*/
366395 
367396 &edp {
368
-	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
369397     force-hpd;
370
-    status = "okay";
371
-};
372
-
373
-&lvds {
374
-    status = "disabled";
375
-    ports {
376
-        port@1 {
377
-            reg = <1>;
378
-            lvds_out: endpoint {
379
-                remote-endpoint = <&panel_in_lvds>;
380
-            };
381
-        };
382
-   
383
-	};
384
-};
385
-
386
-&route_lvds{
387
-	 status = "disabled";
388
-	 connect = <&vp2_out_lvds>;
389
-};
390
-
391
-&lvds_in_vp2 {
392398 	status = "disabled";
393399 };
394400 
395401 &edp_phy {
396
-	status = "okay";
402
+	status = "disabled";
397403 };
398404 
399405 &edp_in_vp0 {
....@@ -401,15 +407,39 @@
401407 };
402408 
403409 &edp_in_vp1 {
404
-    status = "okay";
410
+    status = "disabled";
405411 
406412 };
407413 
408414 &route_edp {
409
-    status = "okay";
415
+    status = "disabled";
410416     connect = <&vp1_out_edp>;
411417 };
412418 
419
+&route_edp {
420
+	status = "disabled";
421
+};
422
+
423
+&lvds {
424
+	status = "disabled";
425
+	ports {
426
+		port@1 {
427
+			reg = <1>;
428
+			lvds_out:endpoint {
429
+				remote-endpoint = <&panel_in_lvds>;
430
+			};
431
+		};
432
+	};
433
+};
434
+
435
+&route_lvds{
436
+	status = "okay";
437
+	connect = <&vp1_out_lvds>;
438
+};
439
+
440
+&lvds_in_vp1 {
441
+	status = "disabled";
442
+};
413443 
414444 /*
415445 *  edp_end
....@@ -625,20 +655,14 @@
625655 	};
626656 };
627657 
628
-&video_phy0 {
629
-	status = "okay";
630
-};
631658 
632
-&video_phy1 {
659
+
660
+&pcie30phy {
633661 	status = "disabled";
634662 };
635663 
636
-&pcie30phy {
637
-	status = "okay";
638
-};
639
-
640
-&pcie3x2 {
641
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
664
+&pcie2x1 {
665
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
642666 	vpcie3v3-supply = <&vcc3v3_pcie>;
643667 	status = "okay";
644668 };
....@@ -693,15 +717,21 @@
693717 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
694718 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
695719 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
720
+							<3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
721
+							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
722
+							<3 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,
696723 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
697
-							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //12
698
-							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //13
699
-							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,  //16
700
-							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,  //17
701
-							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
702
-							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
703
-							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
704
-							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
724
+							<0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B0_u_3V3  DO1
725
+							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B3_u_3V3  DO2
726
+							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B4_u_3V3  DO3
727
+							<0 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B5_u_3V3  DO4
728
+							<0 RK_PB6 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_B6_u_3V3  DO5
729
+							
730
+							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C0_d_3V3 DI1_1
731
+							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C1_d_3V3 DI2_1
732
+							<0 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C2_d_3V3 DI3_1
733
+							<0 RK_PC3 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C3_d_3V3 DI4_1
734
+							<0 RK_PC5 RK_FUNC_GPIO &pcfg_pull_none>,//GPIO0_C5_d_3V3 DI5_1
705735 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
706736 		};
707737 	};
....@@ -767,15 +797,6 @@
767797 	pinctrl-0 = <&uart8m0_xfer &uart8m0_ctsn>;
768798 };
769799 
770
-&vcc3v3_lcd0_n {
771
-	gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; 
772
-	enable-active-high;
773
-};
774
-
775
-&vcc3v3_lcd1_n {
776
-	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
777
-	enable-active-high;
778
-};
779800 
780801 &wireless_wlan {
781802 	pinctrl-names = "default";
....@@ -795,7 +816,7 @@
795816 	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
796817     BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
797818     BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
798
-	status = "okay";
819
+	status = "disabled";
799820 };
800821 
801822 &uart0 {
....@@ -814,7 +835,7 @@
814835 };
815836 
816837 &uart4 {
817
-	status = "okay";
838
+	status = "disabled";
818839 	pinctrl-0 = <&uart4m1_xfer>;
819840 };
820841 
....@@ -823,11 +844,17 @@
823844 	pinctrl-0 = <&uart5m1_xfer>;
824845 };
825846 
847
+
826848 &uart7 {
827
-	status = "disabled";
849
+	status = "okay";
828850 	pinctrl-0 = <&uart7m1_xfer>;
829851 };
830852 
853
+&uart8 {
854
+	status = "disabled";
855
+	pinctrl-0 = <&uart8m1_xfer>;
856
+};
857
+
831858 &uart9 {
832859 	status = "disabled";
833860 	pinctrl-0 = <&uart9m1_xfer>;