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
 			
..
..
@@ -380,12 +380,12 @@
380
380
                 remote-endpoint = <&panel_in>;
381
381
             };
382
382
         };
383
-    };
383
+   
384
+	};
384
385
 };
385
386
 
386
387
 &edp_phy {
387
-  status = "okay";
388
-
388
+	status = "okay";
389
389
 };
390
390
 
391
391
 &edp_in_vp0 {
..
..
@@ -449,7 +449,7 @@
449
449
 	phy-mode = "rgmii";
450
450
 	clock_in_out = "output";
451
451
 
452
-	snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
452
+	snps,reset-gpio = <&gpio2 RK_PC6 GPIO_ACTIVE_LOW>;
453
453
 	snps,reset-active-low;
454
454
 	/* Reset time is 20ms, 100ms for rtl8211f */
455
455
 	snps,reset-delays-us = <0 20000 100000>;
..
..
@@ -469,7 +469,9 @@
469
469
 	rx_delay = <0x2f>;
470
470
 
471
471
 	phy-handle = <&rgmii_phy0>;
472
+	
472
473
 	status = "disabled";
474
+	
473
475
 };
474
476
 
475
477
 &gmac1 {
..
..
@@ -503,9 +505,7 @@
503
505
  * power-supply should switche to vcc3v3_lcd1_n
504
506
  * when mipi panel is connected to dsi1.
505
507
  */
506
-&gt1x {
507
-	power-supply = <&vcc3v3_lcd0_n>;
508
-};
508
+
509
509
 
510
510
 &i2c3 {
511
511
 	status = "okay";
..
..
@@ -524,7 +524,7 @@
524
524
 };
525
525
 
526
526
 &i2c4 {
527
-	status = "okay";
527
+	status = "disabled";
528
528
 	gc8034: gc8034@37 {
529
529
 		compatible = "galaxycore,gc8034";
530
530
 		status = "okay";
..
..
@@ -536,7 +536,6 @@
536
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
537
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
538
538
 		rockchip,grf = <&grf>;
539
-		power-domains = <&power RK3568_PD_VI>;
540
539
 		rockchip,camera-module-index = <0>;
541
540
 		rockchip,camera-module-facing = "back";
542
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -570,7 +569,7 @@
570
569
 		};
571
570
 	};
572
571
 	ov5695: ov5695@36 {
573
-		status = "okay";
572
+		status = "disabled";
574
573
 		compatible = "ovti,ov5695";
575
574
 		reg = <0x36>;
576
575
 		clocks = <&cru CLK_CIF_OUT>;
..
..
@@ -674,7 +673,7 @@
674
673
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
675
674
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
676
675
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
677
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
676
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
678
677
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
679
678
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
680
679
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -713,8 +712,6 @@
713
712
 		};
714
713
 	};
715
714
 };
716
-
717
-
718
715
 
719
716
 
720
717