update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -137,7 +137,7 @@
137
137
 			};
138
138
 			
139
139
 			hp_en {
140
-				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
141
141
 				gpio_function = <0>;
142
142
 			};
143
143
 			
..
..
@@ -145,7 +145,7 @@
145
145
 				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
146
146
 				gpio_function = <0>;
147
147
 			};
148
-			
148
+	#if 0		
149
149
 			do1 {
150
150
 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
151
151
 				gpio_function = <0>;
..
..
@@ -185,6 +185,7 @@
185
185
 				gpio_num = <&gpio2 RK_PD5 GPIO_ACTIVE_HIGH>;
186
186
 				gpio_function = <1>;
187
187
 			};
188
+	#endif
188
189
 		};
189
190
 #if 0			
190
191
 	    nk_io_init {
..
..
@@ -379,12 +380,12 @@
379
380
                 remote-endpoint = <&panel_in>;
380
381
             };
381
382
         };
382
-    };
383
+   
384
+	};
383
385
 };
384
386
 
385
387
 &edp_phy {
386
-  status = "okay";
387
-
388
+	status = "okay";
388
389
 };
389
390
 
390
391
 &edp_in_vp0 {
..
..
@@ -448,7 +449,7 @@
448
449
 	phy-mode = "rgmii";
449
450
 	clock_in_out = "output";
450
451
 
451
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
452
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
452
453
 	snps,reset-active-low;
453
454
 	/* Reset time is 20ms, 100ms for rtl8211f */
454
455
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -468,7 +469,9 @@
468
469
 	rx_delay = <0x2f>;
469
470
 
470
471
 	phy-handle = <&rgmii_phy0>;
472
+	
471
473
 	status = "disabled";
474
+	
472
475
 };
473
476
 
474
477
 &gmac1 {
..
..
@@ -502,9 +505,7 @@
502
505
  * power-supply should switche to vcc3v3_lcd1_n
503
506
  * when mipi panel is connected to dsi1.
504
507
  */
505
-&gt1x {
506
-	power-supply = <&vcc3v3_lcd0_n>;
507
-};
508
+
508
509
 
509
510
 &i2c3 {
510
511
 	status = "okay";
..
..
@@ -523,7 +524,7 @@
523
524
 };
524
525
 
525
526
 &i2c4 {
526
-	status = "okay";
527
+	status = "disabled";
527
528
 	gc8034: gc8034@37 {
528
529
 		compatible = "galaxycore,gc8034";
529
530
 		status = "okay";
..
..
@@ -535,7 +536,6 @@
535
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
536
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
537
538
 		rockchip,grf = <&grf>;
538
-		power-domains = <&power RK3568_PD_VI>;
539
539
 		rockchip,camera-module-index = <0>;
540
540
 		rockchip,camera-module-facing = "back";
541
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -569,7 +569,7 @@
569
569
 		};
570
570
 	};
571
571
 	ov5695: ov5695@36 {
572
-		status = "okay";
572
+		status = "disabled";
573
573
 		compatible = "ovti,ov5695";
574
574
 		reg = <0x36>;
575
575
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -673,7 +673,7 @@
673
673
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
674
674
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
675
675
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
676
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
676
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
677
677
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
678
678
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
679
679
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -712,8 +712,6 @@
712
712
 		};
713
713
 	};
714
714
 };
715
-
716
-
717
715
 
718
716
 
719
717