update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -93,6 +93,9 @@
93
93
          	compatible = "nk_io_control";	
94
94
 			pinctrl-names = "default";
95
95
         	pinctrl-0 = <&nk_io_gpio>;
96
+			
97
+			//gpio_op0 = <&gpio1 RK_PD0 GPIO_ACTIVE_HIGH>;
98
+			
96
99
 			vcc_5v {
97
100
 				gpio_num = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
98
101
 				gpio_function = <0>;	
..
..
@@ -134,7 +137,7 @@
134
137
 			};
135
138
 			
136
139
 			hp_en {
137
-				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
138
141
 				gpio_function = <0>;
139
142
 			};
140
143
 			
..
..
@@ -142,6 +145,47 @@
142
145
 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
143
146
 				gpio_function = <0>;
144
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
145
189
 		};
146
190
 #if 0			
147
191
 	    nk_io_init {
..
..
@@ -336,12 +380,12 @@
336
380
                 remote-endpoint = <&panel_in>;
337
381
             };
338
382
         };
339
-    };
383
+   
384
+	};
340
385
 };
341
386
 
342
387
 &edp_phy {
343
-  status = "okay";
344
-
388
+	status = "okay";
345
389
 };
346
390
 
347
391
 &edp_in_vp0 {
..
..
@@ -405,7 +449,7 @@
405
449
 	phy-mode = "rgmii";
406
450
 	clock_in_out = "output";
407
451
 
408
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
452
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
409
453
 	snps,reset-active-low;
410
454
 	/* Reset time is 20ms, 100ms for rtl8211f */
411
455
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -425,7 +469,9 @@
425
469
 	rx_delay = <0x2f>;
426
470
 
427
471
 	phy-handle = <&rgmii_phy0>;
472
+	
428
473
 	status = "disabled";
474
+	
429
475
 };
430
476
 
431
477
 &gmac1 {
..
..
@@ -459,9 +505,7 @@
459
505
  * power-supply should switche to vcc3v3_lcd1_n
460
506
  * when mipi panel is connected to dsi1.
461
507
  */
462
-&gt1x {
463
-	power-supply = <&vcc3v3_lcd0_n>;
464
-};
508
+
465
509
 
466
510
 &i2c3 {
467
511
 	status = "okay";
..
..
@@ -480,7 +524,7 @@
480
524
 };
481
525
 
482
526
 &i2c4 {
483
-	status = "okay";
527
+	status = "disabled";
484
528
 	gc8034: gc8034@37 {
485
529
 		compatible = "galaxycore,gc8034";
486
530
 		status = "okay";
..
..
@@ -492,7 +536,6 @@
492
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
493
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
494
538
 		rockchip,grf = <&grf>;
495
-		power-domains = <&power RK3568_PD_VI>;
496
539
 		rockchip,camera-module-index = <0>;
497
540
 		rockchip,camera-module-facing = "back";
498
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -526,7 +569,7 @@
526
569
 		};
527
570
 	};
528
571
 	ov5695: ov5695@36 {
529
-		status = "okay";
572
+		status = "disabled";
530
573
 		compatible = "ovti,ov5695";
531
574
 		reg = <0x36>;
532
575
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -669,8 +712,6 @@
669
712
 		};
670
713
 	};
671
714
 };
672
-
673
-
674
715
 
675
716
 
676
717