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>;
..
..
@@ -281,12 +380,12 @@
281
380
                 remote-endpoint = <&panel_in>;
282
381
             };
283
382
         };
284
-    };
383
+   
384
+	};
285
385
 };
286
386
 
287
387
 &edp_phy {
288
-  status = "okay";
289
-
388
+	status = "okay";
290
389
 };
291
390
 
292
391
 &edp_in_vp0 {
..
..
@@ -350,7 +449,7 @@
350
449
 	phy-mode = "rgmii";
351
450
 	clock_in_out = "output";
352
451
 
353
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
452
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
354
453
 	snps,reset-active-low;
355
454
 	/* Reset time is 20ms, 100ms for rtl8211f */
356
455
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -370,7 +469,9 @@
370
469
 	rx_delay = <0x2f>;
371
470
 
372
471
 	phy-handle = <&rgmii_phy0>;
472
+	
373
473
 	status = "disabled";
474
+	
374
475
 };
375
476
 
376
477
 &gmac1 {
..
..
@@ -404,9 +505,7 @@
404
505
  * power-supply should switche to vcc3v3_lcd1_n
405
506
  * when mipi panel is connected to dsi1.
406
507
  */
407
-&gt1x {
408
-	power-supply = <&vcc3v3_lcd0_n>;
409
-};
508
+
410
509
 
411
510
 &i2c3 {
412
511
 	status = "okay";
..
..
@@ -425,7 +524,7 @@
425
524
 };
426
525
 
427
526
 &i2c4 {
428
-	status = "okay";
527
+	status = "disabled";
429
528
 	gc8034: gc8034@37 {
430
529
 		compatible = "galaxycore,gc8034";
431
530
 		status = "okay";
..
..
@@ -437,7 +536,6 @@
437
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
438
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
439
538
 		rockchip,grf = <&grf>;
440
-		power-domains = <&power RK3568_PD_VI>;
441
539
 		rockchip,camera-module-index = <0>;
442
540
 		rockchip,camera-module-facing = "back";
443
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -471,7 +569,7 @@
471
569
 		};
472
570
 	};
473
571
 	ov5695: ov5695@36 {
474
-		status = "okay";
572
+		status = "disabled";
475
573
 		compatible = "ovti,ov5695";
476
574
 		reg = <0x36>;
477
575
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -543,7 +641,8 @@
543
641
 //	};
544
642
 	headphone {
545
643
 		hp_det: hp-det {
546
-			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>;
547
646
 		};
548
647
 	};
549
648
 
..
..
@@ -578,12 +677,15 @@
578
677
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
579
678
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
580
679
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
581
-							<4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>,
582
680
 							<3 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>,
583
681
 							<3 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>,
584
682
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
585
683
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
586
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
587
689
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
588
690
 		};
589
691
 	};
..
..
@@ -610,8 +712,6 @@
610
712
 		};
611
713
 	};
612
714
 };
613
-
614
-
615
715
 
616
716
 
617
717
 
..
..
@@ -673,20 +773,25 @@
673
773
 	clock-names = "ext_clock";
674
774
 	//wifi-bt-power-toggle;
675
775
 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
676
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
677
776
 	pinctrl-names = "default", "rts_gpio";
678
777
 	pinctrl-0 = <&uart1m0_rtsn>;
679
778
 	pinctrl-1 = <&uart1_gpios>;
680
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
681
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
682
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
683
-	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";
684
783
 };
685
784
 
686
785
 &uart0 {
687
786
 	status = "okay";
688
787
 };
689
788
 
789
+&uart1 {	
790
+	pinctrl-names = "default";	
791
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
792
+	status = "okay";		
793
+};
794
+
690
795
 &uart3 {
691
796
 	status = "okay";
692
797
 	pinctrl-0 = <&uart3m1_xfer>;