update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -34,15 +34,6 @@
34
34
 		vin-supply = <&vcc3v3_sys>;
35
35
 	};
36
36
 
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
-	};
46
37
 
47
38
 	pcie30_avdd0v9: pcie30-avdd0v9 {
48
39
 		compatible = "regulator-fixed";
..
..
@@ -69,7 +60,9 @@
69
60
 		regulator-name = "vcc3v3_pcie";
70
61
 		regulator-min-microvolt = <3300000>;
71
62
 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
72
64
 		enable-active-high;
65
+		regulator-boot-on;
73
66
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
74
67
 		startup-delay-us = <5000>;
75
68
 		vin-supply = <&dc_12v>;
..
..
@@ -144,21 +137,14 @@
144
137
 			};
145
138
 			
146
139
 			hp_en {
147
-				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
140
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
148
141
 				gpio_function = <0>;
149
142
 			};
150
143
 			
151
-			usb_ogt {
152
-				gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
144
+			wifi_power_en {
145
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
153
146
 				gpio_function = <0>;
154
147
 			};
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
-			 
162
148
 	#if 0		
163
149
 			do1 {
164
150
 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
..
..
@@ -225,8 +211,9 @@
225
211
 				compatible = "simple-panel";
226
212
 				backlight = <&backlight>;
227
213
 				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
214
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
215
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
216
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
230
217
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
231
218
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
232
219
 				bpc = <8>;
..
..
@@ -239,8 +226,8 @@
239
226
 				nodka-lvds = <15>;
240
227
 
241
228
 				display-timings {
242
-                native-mode = <&timing>;
243
-                timing: timing {
229
+                native-mode = <&timing0>;
230
+                timing0: timing0 {
244
231
 					clock-frequency = <72500000>;
245
232
 					hactive = <1280>;
246
233
 					vactive = <800>;
..
..
@@ -256,9 +243,9 @@
256
243
 					pixelclk-active = <0>;			
257
244
 					};
258
245
 				};
259
-				port {
260
-					panel_in_lvds: endpoint {
261
-					remote-endpoint = <&lvds_out>;
246
+				ports {
247
+					panel_in: endpoint {
248
+					remote-endpoint = <&edp_out>;
262
249
 						};
263
250
 					};   
264
251
 				};
..
..
@@ -348,6 +335,10 @@
348
335
  * video_phy1 needs to be enabled
349
336
  * when dsi1 is enabled
350
337
  */
338
+ 
339
+&video_phy1 {
340
+	status = "okay";
341
+}; 
351
342
 &dsi1 {
352
343
 	status = "disabled";
353
344
 };
..
..
@@ -357,39 +348,40 @@
357
348
 };
358
349
 
359
350
 &dsi1_in_vp1 {
360
-	status = "disabled";
351
+	status = "okay";
361
352
 };
362
353
 
363
354
 &dsi1_panel {
364
-	power-supply = <&vcc3v3_lcd1_n>;
355
+	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
356
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
357
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
358
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
359
+    pinctrl-names = "default";
360
+    pinctrl-0 = <&lcd1_rst_gpio>;
365
361
 };
362
+
363
+&route_dsi1 {
364
+	status = "disabled";
365
+	connect = <&vp1_out_dsi1>;
366
+};
367
+
368
+
369
+/*
370
+*  edp_start
371
+*/
366
372
 
367
373
 &edp {
368
-	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
369
374
     force-hpd;
370
375
     status = "okay";
371
-};
372
-
373
-&lvds {
374
-    status = "disabled";
375
376
     ports {
376
377
         port@1 {
377
378
             reg = <1>;
378
-            lvds_out: endpoint {
379
-                remote-endpoint = <&panel_in_lvds>;
379
+            edp_out: endpoint {
380
+                remote-endpoint = <&panel_in>;
380
381
             };
381
382
         };
382
383
    
383
384
 	};
384
-};
385
-
386
-&route_lvds{
387
-	 status = "disabled";
388
-	 connect = <&vp2_out_lvds>;
389
-};
390
-
391
-&lvds_in_vp2 {
392
-	status = "disabled";
393
385
 };
394
386
 
395
387
 &edp_phy {
..
..
@@ -410,7 +402,9 @@
410
402
     connect = <&vp1_out_edp>;
411
403
 };
412
404
 
413
-
405
+&route_edp {
406
+	status = "okay";
407
+};
414
408
 /*
415
409
 *  edp_end
416
410
 */
..
..
@@ -625,20 +619,14 @@
625
619
 	};
626
620
 };
627
621
 
628
-&video_phy0 {
629
-	status = "okay";
630
-};
631
622
 
632
-&video_phy1 {
633
-	status = "disabled";
634
-};
635
623
 
636
624
 &pcie30phy {
637
625
 	status = "okay";
638
626
 };
639
627
 
640
-&pcie3x2 {
641
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
628
+&pcie2x1 {
629
+	reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
642
630
 	vpcie3v3-supply = <&vcc3v3_pcie>;
643
631
 	status = "okay";
644
632
 };
..
..
@@ -694,10 +682,6 @@
694
682
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
695
683
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
696
684
 							<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
685
 							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
702
686
 							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
703
687
 							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
..
..
@@ -799,13 +783,13 @@
799
783
 };
800
784
 
801
785
 &uart0 {
802
-	status = "disabled";
786
+	status = "okay";
803
787
 };
804
788
 
805
789
 &uart1 {	
806
790
 	pinctrl-names = "default";	
807
791
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
808
-	status = "disabled";		
792
+	status = "okay";		
809
793
 };
810
794
 
811
795
 &uart3 {
..
..
@@ -824,11 +808,11 @@
824
808
 };
825
809
 
826
810
 &uart7 {
827
-	status = "disabled";
811
+	status = "okay";
828
812
 	pinctrl-0 = <&uart7m1_xfer>;
829
813
 };
830
814
 
831
815
 &uart9 {
832
-	status = "disabled";
816
+	status = "okay";
833
817
 	pinctrl-0 = <&uart9m1_xfer>;
834
818
 };