update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -19,6 +19,7 @@
19
19
 	rk_headset: rk-headset {
20
20
 		compatible = "rockchip_headset";
21
21
 		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
+		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
22
23
 		pinctrl-names = "default";
23
24
 		pinctrl-0 = <&hp_det>;
24
25
 	};
..
..
@@ -88,10 +89,108 @@
88
89
 		regulator-boot-on;
89
90
     	};
90
91
 #endif
91
-
92
+	ndj_io_init {
93
+         	compatible = "nk_io_control";	
94
+			pinctrl-names = "default";
95
+        	pinctrl-0 = <&nk_io_gpio>;
96
+			
97
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
98
+			
99
+			vcc_5v {
100
+				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
101
+				gpio_function = <0>;	
102
+			};
103
+			
104
+			vcc_12v {
105
+				gpio_num = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>;  //VCC12_IO_EN_GPIO0_C7_3V3
106
+				gpio_function = <0>;
107
+			};
108
+			
109
+			hub_host2_rst {
110
+				gpio_num = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>;  //HUB_RST_GPIO4_D2_3V3
111
+				gpio_function = <3>;
112
+			};
113
+			
114
+			hub_host3 {
115
+				gpio_num = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
116
+				gpio_function = <0>;
117
+			};
118
+			
119
+			wake_4g {
120
+				gpio_num = <&gpio1 RK_PB1 GPIO_ACTIVE_LOW>; //4G_WAKEUP_GPIO01_B1_3V3
121
+				gpio_function = <0>;
122
+			};
123
+			
124
+			air_mode_4g {
125
+				gpio_num = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>; //4G_AIR_MODE_GPIO01_B0_3V3
126
+				gpio_function = <0>;
127
+			};
128
+			
129
+			reset_4g {
130
+				gpio_num = <&gpio1 RK_PB2 GPIO_ACTIVE_LOW>; //4G_RST_GPIO01_B2_3V3
131
+				gpio_function = <3>;
132
+			};
133
+			
134
+			en_4g {
135
+				gpio_num = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
136
+				gpio_function = <0>;
137
+			};
138
+			
139
+			hp_en {
140
+				gpio_num = <&gpio3 RK_PA6 GPIO_ACTIVE_LOW>;//HP_EN_GPIO3_A6_3V3
141
+				gpio_function = <0>;
142
+			};
143
+			
144
+			wifi_power_en {
145
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
146
+				gpio_function = <0>;
147
+			};
148
+	#if 0		
149
+			do1 {
150
+				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
151
+				gpio_function = <0>;
152
+			};
153
+			
154
+			do2 {
155
+				gpio_num = <&gpio1 RK_PD2 GPIO_ACTIVE_HIGH>;
156
+				gpio_function = <0>;
157
+			};
158
+			
159
+			do3 {
160
+				gpio_num = <&gpio1 RK_PD1 GPIO_ACTIVE_HIGH>;
161
+				gpio_function = <0>;
162
+			};
163
+			
164
+			do4 {
165
+				gpio_num = <&gpio1 RK_PD3 GPIO_ACTIVE_HIGH>;
166
+				gpio_function = <0>;
167
+			};
168
+			
169
+			do5 {
170
+				gpio_num = <&gpio2 RK_PD6 GPIO_ACTIVE_LOW>; 
171
+				gpio_function = <0>;
172
+			};
173
+			
174
+			do6 {
175
+				gpio_num = <&gpio2 RK_PD7 GPIO_ACTIVE_LOW>; 
176
+				gpio_function = <0>;
177
+			};
178
+			
179
+			do7 {
180
+				gpio_num = <&gpio3 RK_PA0 GPIO_ACTIVE_LOW>; 
181
+				gpio_function = <0>;
182
+			};
183
+			
184
+			di1 {
185
+				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
186
+				gpio_function = <1>;
187
+			};
188
+	#endif
189
+		};
190
+#if 0			
92
191
 	    nk_io_init {
93
192
                 compatible = "nk_io_control";
94
-				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
193
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
95
194
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
96
195
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
97
196
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -101,13 +200,13 @@
101
200
                 air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
102
201
                 wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
103
202
 				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
104
-                spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
203
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
105
204
 				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
106
205
 //				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
107
206
 				pinctrl-names = "default";
108
207
 				pinctrl-0 = <&nk_io_gpio>;				
109
208
         };
110
-		
209
+#endif	
111
210
 		panel: panel {
112
211
 				compatible = "simple-panel";
113
212
 				backlight = <&backlight>;
..
..
@@ -124,21 +223,21 @@
124
223
 				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
125
224
 				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
126
225
 				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
127
-				nodka-lvds = <9>;
226
+				nodka-lvds = <15>;
128
227
 
129
228
 				display-timings {
130
229
                 native-mode = <&timing0>;
131
230
                 timing0: timing0 {
132
-					clock-frequency = <142300000>;
133
-					hactive = <1920>;
134
-					vactive = <1080>;
135
-					hfront-porch = <48>;
136
-					hsync-len = <32>;
137
-					hback-porch = <100>;
231
+					clock-frequency = <72500000>;
232
+					hactive = <1280>;
233
+					vactive = <800>;
234
+					hfront-porch = <70>;
235
+					hsync-len = <2>;
236
+					hback-porch = <88>;
138
237
 					vfront-porch = <7>;
139
-					vsync-len = <20>;
140
-					vback-porch = <23>;
141
-					hsync-active = <0>;
238
+					vsync-len = <4>;
239
+					vback-porch = <17>;
240
+					hsync-active = <21>;
142
241
 					vsync-active = <0>;
143
242
 					de-active = <0>;
144
243
 					pixelclk-active = <0>;			
..
..
@@ -238,7 +337,7 @@
238
337
  */
239
338
  
240
339
 &video_phy1 {
241
-	status = "disabled";
340
+	status = "okay";
242
341
 }; 
243
342
 &dsi1 {
244
343
 	status = "disabled";
..
..
@@ -249,12 +348,23 @@
249
348
 };
250
349
 
251
350
 &dsi1_in_vp1 {
252
-	status = "disabled";
351
+	status = "okay";
253
352
 };
254
353
 
255
354
 &dsi1_panel {
256
-	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>;
257
361
 };
362
+
363
+&route_dsi1 {
364
+	status = "disabled";
365
+	connect = <&vp1_out_dsi1>;
366
+};
367
+
258
368
 
259
369
 /*
260
370
 *  edp_start
..
..
@@ -270,11 +380,12 @@
270
380
                 remote-endpoint = <&panel_in>;
271
381
             };
272
382
         };
273
-    };
383
+   
384
+	};
274
385
 };
275
386
 
276
387
 &edp_phy {
277
-    status = "okay";
388
+	status = "okay";
278
389
 };
279
390
 
280
391
 &edp_in_vp0 {
..
..
@@ -283,6 +394,7 @@
283
394
 
284
395
 &edp_in_vp1 {
285
396
     status = "okay";
397
+
286
398
 };
287
399
 
288
400
 &route_edp {
..
..
@@ -337,7 +449,7 @@
337
449
 	phy-mode = "rgmii";
338
450
 	clock_in_out = "output";
339
451
 
340
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
452
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
341
453
 	snps,reset-active-low;
342
454
 	/* Reset time is 20ms, 100ms for rtl8211f */
343
455
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -357,7 +469,9 @@
357
469
 	rx_delay = <0x2f>;
358
470
 
359
471
 	phy-handle = <&rgmii_phy0>;
472
+	
360
473
 	status = "disabled";
474
+	
361
475
 };
362
476
 
363
477
 &gmac1 {
..
..
@@ -391,9 +505,7 @@
391
505
  * power-supply should switche to vcc3v3_lcd1_n
392
506
  * when mipi panel is connected to dsi1.
393
507
  */
394
-&gt1x {
395
-	power-supply = <&vcc3v3_lcd0_n>;
396
-};
508
+
397
509
 
398
510
 &i2c3 {
399
511
 	status = "okay";
..
..
@@ -412,7 +524,7 @@
412
524
 };
413
525
 
414
526
 &i2c4 {
415
-	status = "okay";
527
+	status = "disabled";
416
528
 	gc8034: gc8034@37 {
417
529
 		compatible = "galaxycore,gc8034";
418
530
 		status = "okay";
..
..
@@ -424,7 +536,6 @@
424
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
425
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
426
538
 		rockchip,grf = <&grf>;
427
-		power-domains = <&power RK3568_PD_VI>;
428
539
 		rockchip,camera-module-index = <0>;
429
540
 		rockchip,camera-module-facing = "back";
430
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -458,7 +569,7 @@
458
569
 		};
459
570
 	};
460
571
 	ov5695: ov5695@36 {
461
-		status = "okay";
572
+		status = "disabled";
462
573
 		compatible = "ovti,ov5695";
463
574
 		reg = <0x36>;
464
575
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -530,7 +641,8 @@
530
641
 //	};
531
642
 	headphone {
532
643
 		hp_det: hp-det {
533
-			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>;
644
+			rockchip,pins = <0 RK_PD5 RK_FUNC_GPIO &pcfg_pull_down>,
645
+							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_down>;
534
646
 		};
535
647
 	};
536
648
 
..
..
@@ -545,6 +657,13 @@
545
657
 			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
546
658
 		};
547
659
 	};
660
+	
661
+	lcd1 {
662
+        lcd1_rst_gpio: lcd1-rst-gpio {
663
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
664
+        };
665
+    };
666
+		
548
667
 	nk_io_init{
549
668
 		nk_io_gpio: nk-io-gpio{
550
669
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -558,12 +677,15 @@
558
677
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
559
678
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
560
679
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
561
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
562
680
 							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
563
681
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
564
682
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
565
683
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
566
684
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
685
+							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
686
+							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
687
+							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
688
+							<3 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>,//96 SPI2_CLK_M1_3V3
567
689
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
568
690
 		};
569
691
 	};
..
..
@@ -589,11 +711,6 @@
589
711
 			remote-endpoint = <&csidphy_out>;
590
712
 		};
591
713
 	};
592
-};
593
-
594
-&route_dsi0 {
595
-	status = "disabled";
596
-	connect = <&vp1_out_dsi0>;
597
714
 };
598
715
 
599
716
 
..
..
@@ -640,7 +757,7 @@
640
757
 };
641
758
 
642
759
 &vcc3v3_lcd1_n {
643
-	gpio = <&gpio0 RK_PC5 GPIO_ACTIVE_HIGH>;
760
+	gpio = <&gpio3 RK_PA3 GPIO_ACTIVE_HIGH>; //MIPI_3V3EN_GPIO3_A3_d_3V3
644
761
 	enable-active-high;
645
762
 };
646
763
 
..
..
@@ -656,20 +773,25 @@
656
773
 	clock-names = "ext_clock";
657
774
 	//wifi-bt-power-toggle;
658
775
 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
659
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
660
776
 	pinctrl-names = "default", "rts_gpio";
661
777
 	pinctrl-0 = <&uart1m0_rtsn>;
662
778
 	pinctrl-1 = <&uart1_gpios>;
663
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
664
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
665
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
666
-	status = "disabled";
779
+	BT,reset_gpio    = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
780
+    BT,wake_gpio     = <&gpio2 RK_PC0 GPIO_ACTIVE_HIGH>;
781
+    BT,wake_host_irq = <&gpio2 RK_PC1 GPIO_ACTIVE_HIGH>;
782
+	status = "okay";
667
783
 };
668
784
 
669
785
 &uart0 {
670
786
 	status = "okay";
671
787
 };
672
788
 
789
+&uart1 {	
790
+	pinctrl-names = "default";	
791
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
792
+	status = "okay";		
793
+};
794
+
673
795
 &uart3 {
674
796
 	status = "okay";
675
797
 	pinctrl-0 = <&uart3m1_xfer>;