update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -89,10 +89,108 @@
89
89
 		regulator-boot-on;
90
90
     	};
91
91
 #endif
92
-
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			
93
191
 	    nk_io_init {
94
192
                 compatible = "nk_io_control";
95
-				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
96
194
                 hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
97
195
                 hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
98
196
                 vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
..
..
@@ -108,7 +206,7 @@
108
206
 				pinctrl-names = "default";
109
207
 				pinctrl-0 = <&nk_io_gpio>;				
110
208
         };
111
-		
209
+#endif	
112
210
 		panel: panel {
113
211
 				compatible = "simple-panel";
114
212
 				backlight = <&backlight>;
..
..
@@ -282,12 +380,12 @@
282
380
                 remote-endpoint = <&panel_in>;
283
381
             };
284
382
         };
285
-    };
383
+   
384
+	};
286
385
 };
287
386
 
288
387
 &edp_phy {
289
-  status = "okay";
290
-
388
+	status = "okay";
291
389
 };
292
390
 
293
391
 &edp_in_vp0 {
..
..
@@ -351,7 +449,7 @@
351
449
 	phy-mode = "rgmii";
352
450
 	clock_in_out = "output";
353
451
 
354
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
452
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
355
453
 	snps,reset-active-low;
356
454
 	/* Reset time is 20ms, 100ms for rtl8211f */
357
455
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -371,7 +469,9 @@
371
469
 	rx_delay = <0x2f>;
372
470
 
373
471
 	phy-handle = <&rgmii_phy0>;
472
+	
374
473
 	status = "disabled";
474
+	
375
475
 };
376
476
 
377
477
 &gmac1 {
..
..
@@ -405,9 +505,7 @@
405
505
  * power-supply should switche to vcc3v3_lcd1_n
406
506
  * when mipi panel is connected to dsi1.
407
507
  */
408
-&gt1x {
409
-	power-supply = <&vcc3v3_lcd0_n>;
410
-};
508
+
411
509
 
412
510
 &i2c3 {
413
511
 	status = "okay";
..
..
@@ -426,7 +524,7 @@
426
524
 };
427
525
 
428
526
 &i2c4 {
429
-	status = "okay";
527
+	status = "disabled";
430
528
 	gc8034: gc8034@37 {
431
529
 		compatible = "galaxycore,gc8034";
432
530
 		status = "okay";
..
..
@@ -438,7 +536,6 @@
438
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
439
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
440
538
 		rockchip,grf = <&grf>;
441
-		power-domains = <&power RK3568_PD_VI>;
442
539
 		rockchip,camera-module-index = <0>;
443
540
 		rockchip,camera-module-facing = "back";
444
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -472,7 +569,7 @@
472
569
 		};
473
570
 	};
474
571
 	ov5695: ov5695@36 {
475
-		status = "okay";
572
+		status = "disabled";
476
573
 		compatible = "ovti,ov5695";
477
574
 		reg = <0x36>;
478
575
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -585,6 +682,10 @@
585
682
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
586
683
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
587
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
588
689
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
589
690
 		};
590
691
 	};
..
..
@@ -611,8 +712,6 @@
611
712
 		};
612
713
 	};
613
714
 };
614
-
615
-
616
715
 
617
716
 
618
717
 
..
..
@@ -674,20 +773,25 @@
674
773
 	clock-names = "ext_clock";
675
774
 	//wifi-bt-power-toggle;
676
775
 	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
677
-	BT,power_gpio = <&gpio2 RK_PB7 GPIO_ACTIVE_HIGH>;
678
776
 	pinctrl-names = "default", "rts_gpio";
679
777
 	pinctrl-0 = <&uart1m0_rtsn>;
680
778
 	pinctrl-1 = <&uart1_gpios>;
681
-	BT,reset_gpio    = <&gpio3 RK_PA0 GPIO_ACTIVE_HIGH>;
682
-	BT,wake_gpio     = <&gpio3 RK_PA2 GPIO_ACTIVE_HIGH>;
683
-	BT,wake_host_irq = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
684
-	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";
685
783
 };
686
784
 
687
785
 &uart0 {
688
786
 	status = "okay";
689
787
 };
690
788
 
789
+&uart1 {	
790
+	pinctrl-names = "default";	
791
+	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
792
+	status = "okay";		
793
+};
794
+
691
795
 &uart3 {
692
796
 	status = "okay";
693
797
 	pinctrl-0 = <&uart3m1_xfer>;