update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/NK-R36S0.dtsi
..
..
@@ -16,6 +16,14 @@
16
16
 	model = "Rockchip RK3568 EVB1 DDR4 V10 Board";
17
17
 	compatible = "rockchip,rk3568-evb1-ddr4-v10", "rockchip,rk3568";
18
18
 
19
+	rk_headset: rk-headset {
20
+		compatible = "rockchip_headset";
21
+		headset_gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_LOW>;
22
+		spk_ctl_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_LOW>;//AMP_SD_GPIO4_C2_3V3
23
+		pinctrl-names = "default";
24
+		pinctrl-0 = <&hp_det>;
25
+	};
26
+
19
27
 	vcc2v5_sys: vcc2v5-ddr {
20
28
 		compatible = "regulator-fixed";
21
29
 		regulator-name = "vcc2v5-sys";
..
..
@@ -26,15 +34,6 @@
26
34
 		vin-supply = <&vcc3v3_sys>;
27
35
 	};
28
36
 
29
-	vcc3v3_vga: vcc3v3-vga {
30
-		compatible = "regulator-fixed";
31
-		regulator-name = "vcc3v3_vga";
32
-		regulator-always-on;
33
-		regulator-boot-on;
34
-		gpio = <&gpio0 RK_PD5 GPIO_ACTIVE_HIGH>;
35
-		enable-active-high;
36
-		vin-supply = <&vcc3v3_sys>;
37
-	};
38
37
 
39
38
 	pcie30_avdd0v9: pcie30-avdd0v9 {
40
39
 		compatible = "regulator-fixed";
..
..
@@ -61,7 +60,9 @@
61
60
 		regulator-name = "vcc3v3_pcie";
62
61
 		regulator-min-microvolt = <3300000>;
63
62
 		regulator-max-microvolt = <3300000>;
63
+		regulator-always-on;
64
64
 		enable-active-high;
65
+		regulator-boot-on;
65
66
 		gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;
66
67
 		startup-delay-us = <5000>;
67
68
 		vin-supply = <&dc_12v>;
..
..
@@ -86,9 +87,8 @@
86
87
 		enable-active-high;
87
88
 		regulator-always-on;
88
89
 		regulator-boot-on;
89
-	};
90
+    	};
90
91
 #endif
91
-
92
92
 	ndj_io_init {
93
93
          	compatible = "nk_io_control";	
94
94
 			pinctrl-names = "default";
..
..
@@ -137,21 +137,14 @@
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
 			
144
-			usb_ogt {
145
-				gpio_num = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>; //OTG_EN_OC_GPIO0_C2
144
+			wifi_power_en {
145
+				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
146
146
 				gpio_function = <0>;
147
147
 			};
148
-			
149
-			m2_wifi_pwr {
150
-				gpio_num = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>;//WIFI_PWREN_GPIO3_C6_1V8
151
-				gpio_function = <0>;
152
-			};
153
-			
154
-			 
155
148
 	#if 0		
156
149
 			do1 {
157
150
 				gpio_num = <&gpio1 RK_PD0 GPIO_ACTIVE_LOW>; 
..
..
@@ -193,23 +186,48 @@
193
186
 				gpio_function = <1>;
194
187
 			};
195
188
 	#endif
196
-	};
197
-	
198
-			panel: panel {
189
+		};
190
+#if 0			
191
+	    nk_io_init {
192
+                compatible = "nk_io_control";
193
+//				vcc3_io_en_gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>; //VCC3_IO_EN_GPIO0_C4_3V3
194
+                hub_host2_5V_rest_gpio = <&gpio4 RK_PD2 GPIO_ACTIVE_HIGH>; //HUB_RST_GPIO4_D2_3V3
195
+                hub_host3_5v_gpio = <&gpio4 RK_PB2 GPIO_ACTIVE_HIGH>; //HOST3_EN_GPIO4_B2_1V8
196
+                vcc_5v_io = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>;   //VCC5_IO_EN_GPIO1_A4_3V3
197
+                vcc_12v_io = <&gpio0 RK_PC7 GPIO_ACTIVE_HIGH>; //VCC12_IO_EN_GPIO0_C7_3V3
198
+                en_4g_gpio = <&gpio0 RK_PC6 GPIO_ACTIVE_HIGH>; //4G_PWREN_H_GPIO0_C6
199
+                reset_4g_gpio = <&gpio1 RK_PB2 GPIO_ACTIVE_HIGH>; //4G_RST_GPIO01_B2_3V3
200
+                air_mode_4g_gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_HIGH>; //4G_AIR_MODE_GPIO01_B0_3V3
201
+                wake_4g_gpio = <&gpio1 RK_PB1 GPIO_ACTIVE_HIGH>; //4G_WAKEUP_GPIO01_B1_3V3
202
+				hp_en_gpio = <&gpio3 RK_PA6 GPIO_ACTIVE_HIGH>;//HP_EN_GPIO3_A6_3V3
203
+//              spk_out_gpio = <&gpio4 RK_PC2 GPIO_ACTIVE_HIGH>;//AMP_SD_GPIO4_C2_3V3			
204
+				wifi_power_en_gpio = <&gpio3 RK_PC6 GPIO_ACTIVE_HIGH>; //WIFI_PWREN_GPIO3_C6_1V8
205
+//				pcie_power_en_gpio = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>;//PCIE_PWREN_H_GPIO0_D4				
206
+				pinctrl-names = "default";
207
+				pinctrl-0 = <&nk_io_gpio>;				
208
+        };
209
+#endif	
210
+		panel: panel {
199
211
 				compatible = "simple-panel";
200
212
 				backlight = <&backlight>;
201
213
 				power-supply = <&vcc3v3_lcd0_n>;
202
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
203
-				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
214
+				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4
215
+				reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_LOW>; //7511_RST_GPIO3_D1
216
+				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_BKLT_EN_3V3
204
217
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
205
218
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
206
219
 				bpc = <8>;
207
220
 				prepare-delay-ms = <200>;
208
221
 				enable-delay-ms = <20>;
222
+				lvds-gpio0 = <&gpio3 RK_PD2 GPIO_ACTIVE_HIGH>; //7511_GPIO0-GPIO3_D2 
223
+				lvds-gpio1 = <&gpio3 RK_PD3 GPIO_ACTIVE_HIGH>; //7511_GPIO1-GPIO3_D3 
224
+				lvds-gpio2 = <&gpio3 RK_PD4 GPIO_ACTIVE_HIGH>; //7511_GPIO2-GPIO3_D4 
225
+				lvds-gpio3 = <&gpio3 RK_PD5 GPIO_ACTIVE_HIGH>; //7511_GPIO3-GPIO3_D5
226
+				nodka-lvds = <15>;
209
227
 
210
228
 				display-timings {
211
-                native-mode = <&timing>;
212
-                timing: timing {
229
+                native-mode = <&timing0>;
230
+                timing0: timing0 {
213
231
 					clock-frequency = <72500000>;
214
232
 					hactive = <1280>;
215
233
 					vactive = <800>;
..
..
@@ -226,8 +244,8 @@
226
244
 					};
227
245
 				};
228
246
 				ports {
229
-					panel_in_lvds: endpoint {
230
-					remote-endpoint = <&lvds_out>;
247
+					panel_in: endpoint {
248
+					remote-endpoint = <&edp_out>;
231
249
 						};
232
250
 					};   
233
251
 				};
..
..
@@ -293,6 +311,10 @@
293
311
  * video_phy0 needs to be enabled
294
312
  * when dsi0 is enabled
295
313
  */
314
+&video_phy0 {
315
+	status = "disabled";
316
+};
317
+
296
318
 &dsi0 {
297
319
 	status = "disabled";
298
320
 };
..
..
@@ -313,6 +335,10 @@
313
335
  * video_phy1 needs to be enabled
314
336
  * when dsi1 is enabled
315
337
  */
338
+ 
339
+&video_phy1 {
340
+	status = "okay";
341
+}; 
316
342
 &dsi1 {
317
343
 	status = "disabled";
318
344
 };
..
..
@@ -322,39 +348,40 @@
322
348
 };
323
349
 
324
350
 &dsi1_in_vp1 {
325
-	status = "disabled";
351
+	status = "okay";
326
352
 };
327
353
 
328
354
 &dsi1_panel {
329
-	power-supply = <&vcc3v3_lcd1_n>;
355
+	power-supply = <&vcc3v3_lcd1_n>;   //MIPI_3V3EN_GPIO3_A3_d_3V3
356
+    vddio-mipi = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>; //MIPI_EN_1V8_GPIO3_A4_d_3V3
357
+    reset-gpios = <&gpio3 RK_PC7 GPIO_ACTIVE_LOW>; //MIPI_RST_L_GPIO3_C7
358
+    vcc-5v-gpio = <&gpio1 RK_PA4 GPIO_ACTIVE_HIGH>; //VCC5_IO_EN_GPIO1_A4_3V3
359
+    pinctrl-names = "default";
360
+    pinctrl-0 = <&lcd1_rst_gpio>;
330
361
 };
362
+
363
+&route_dsi1 {
364
+	status = "disabled";
365
+	connect = <&vp1_out_dsi1>;
366
+};
367
+
368
+
369
+/*
370
+*  edp_start
371
+*/
331
372
 
332
373
 &edp {
333
-	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
334
374
     force-hpd;
335
-    status = "disabled";
336
-};
337
-
338
-&lvds {
339
375
     status = "okay";
340
376
     ports {
341
377
         port@1 {
342
378
             reg = <1>;
343
-            lvds_out: endpoint {
344
-                remote-endpoint = <&panel_in_lvds>;
379
+            edp_out: endpoint {
380
+                remote-endpoint = <&panel_in>;
345
381
             };
346
382
         };
347
383
    
348
384
 	};
349
-};
350
-
351
-&route_lvds{
352
-	 status = "okay";
353
-	 connect = <&vp2_out_lvds>;
354
-};
355
-
356
-&lvds_in_vp2 {
357
-	status = "okay";
358
385
 };
359
386
 
360
387
 &edp_phy {
..
..
@@ -362,12 +389,61 @@
362
389
 };
363
390
 
364
391
 &edp_in_vp0 {
365
-	status = "disabled";
392
+    status = "disabled";
366
393
 };
367
394
 
368
395
 &edp_in_vp1 {
396
+    status = "okay";
397
+
398
+};
399
+
400
+&route_edp {
401
+    status = "okay";
402
+    connect = <&vp1_out_edp>;
403
+};
404
+
405
+&route_edp {
369
406
 	status = "okay";
370
407
 };
408
+/*
409
+*  edp_end
410
+*/
411
+
412
+/*
413
+*  Hdmi_start
414
+*/
415
+
416
+&hdmi {
417
+	status = "okay";
418
+	rockchip,phy-table =
419
+		<92812500  0x8009 0x0000 0x0270>,
420
+		<165000000 0x800b 0x0000 0x026d>,
421
+		<185625000 0x800b 0x0000 0x01ed>,
422
+		<297000000 0x800b 0x0000 0x01ad>,
423
+		<594000000 0x8029 0x0000 0x0088>,
424
+		<000000000 0x0000 0x0000 0x0000>;
425
+};
426
+
427
+&route_hdmi {
428
+	status = "okay";
429
+	connect = <&vp0_out_hdmi>;
430
+};
431
+
432
+&hdmi_in_vp0 {
433
+	status = "okay";
434
+};
435
+
436
+&hdmi_in_vp1 {
437
+	status = "disabled";
438
+};
439
+
440
+&hdmi_sound {
441
+	status = "okay";
442
+};
443
+
444
+/*
445
+ *  Hdmi_END
446
+*/
371
447
 
372
448
 &gmac0 {
373
449
 	phy-mode = "rgmii";
..
..
@@ -394,7 +470,7 @@
394
470
 
395
471
 	phy-handle = <&rgmii_phy0>;
396
472
 	
397
-	status = "okay";
473
+	status = "disabled";
398
474
 	
399
475
 };
400
476
 
..
..
@@ -460,7 +536,6 @@
460
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
461
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
462
538
 		rockchip,grf = <&grf>;
463
-		power-domains = <&power RK3568_PD_VI>;
464
539
 		rockchip,camera-module-index = <0>;
465
540
 		rockchip,camera-module-facing = "back";
466
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -517,6 +592,19 @@
517
592
 	};
518
593
 };
519
594
 
595
+&i2c5 {
596
+	status = "okay";
597
+
598
+	hym8563: hym8563@51 {
599
+		compatible = "haoyu,hym8563";
600
+		reg = <0x51>;
601
+		#clock-cells = <0>;
602
+		clock-frequency = <32768>;
603
+		clock-output-names = "xin32k";
604
+		/* rtc_int is not connected */
605
+	};
606
+};
607
+
520
608
 &mdio0 {
521
609
 	rgmii_phy0: phy@0 {
522
610
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -531,13 +619,7 @@
531
619
 	};
532
620
 };
533
621
 
534
-&video_phy0 {
535
-	status = "okay";
536
-};
537
622
 
538
-&video_phy1 {
539
-	status = "disabled";
540
-};
541
623
 
542
624
 &pcie30phy {
543
625
 	status = "okay";
..
..
@@ -549,33 +631,39 @@
549
631
 	status = "okay";
550
632
 };
551
633
 
552
-&pcie3x2 {
553
-	reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
554
-	vpcie3v3-supply = <&vcc3v3_pcie>;
555
-	status = "disabled";
556
-};
557
-
558
-&pcie3x1 {
559
-	rockchip,bifurcation;
560
-	reset-gpios = <&gpio3 RK_PA1 GPIO_ACTIVE_HIGH>;
561
-	vpcie3v3-supply = <&vcc3v3_pcie>;
562
-	status = "okay";
563
-};
564
-
565
634
 &pinctrl {
566
-
635
+//	cam {
636
+//		camera_pwr: camera-pwr {
637
+//			rockchip,pins =
638
+//				/* camera power en */
639
+//				<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>;
640
+//		};
641
+//	};
567
642
 	headphone {
568
643
 		hp_det: hp-det {
569
-			rockchip,pins = <3 RK_PC2 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>;
570
646
 		};
571
647
 	};
572
648
 
573
649
 	wireless-wlan {
574
650
 		wifi_host_wake_irq: wifi-host-wake-irq {
575
-			rockchip,pins = <3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_down>;
651
+			rockchip,pins = <2 RK_PB2 RK_FUNC_GPIO &pcfg_pull_down>;
652
+		};
653
+	};
654
+
655
+	wireless-bluetooth {
656
+		uart1_gpios: uart1-gpios {
657
+			rockchip,pins = <2 RK_PB5 RK_FUNC_GPIO &pcfg_pull_none>;
576
658
 		};
577
659
 	};
578
660
 	
661
+	lcd1 {
662
+        lcd1_rst_gpio: lcd1-rst-gpio {
663
+            rockchip,pins = <3 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>;
664
+        };
665
+    };
666
+		
579
667
 	nk_io_init{
580
668
 		nk_io_gpio: nk-io-gpio{
581
669
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -585,7 +673,7 @@
585
673
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
586
674
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
587
675
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
588
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
676
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
589
677
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
590
678
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
591
679
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -594,10 +682,6 @@
594
682
 							<3 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>,
595
683
 							<3 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,
596
684
 							<3 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>,
597
-							<0 RK_PB3 RK_FUNC_GPIO &pcfg_pull_none>,  //12
598
-							<0 RK_PB4 RK_FUNC_GPIO &pcfg_pull_none>,  //13
599
-							<0 RK_PC0 RK_FUNC_GPIO &pcfg_pull_none>,  //16
600
-							<0 RK_PC1 RK_FUNC_GPIO &pcfg_pull_none>,  //17
601
685
 							<2 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>,//93 SPI2_CS0_M1_3V3
602
686
 							<2 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>,//94 SPI2_MOSI_M1_3V3
603
687
 							<2 RK_PD7 RK_FUNC_GPIO &pcfg_pull_none>,//95 SPI2_MISO_M1_3V3
..
..
@@ -605,10 +689,6 @@
605
689
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
606
690
 		};
607
691
 	};
608
-};
609
-
610
-&rk809_sound {
611
-	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
612
692
 };
613
693
 
614
694
 &rkisp {
..
..
@@ -633,36 +713,30 @@
633
713
 	};
634
714
 };
635
715
 
636
-&route_dsi0 {
637
-	status = "disabled";
638
-	connect = <&vp1_out_dsi0>;
639
-};
640
716
 
641
-
642
-
643
-&route_edp {
644
-	status = "disabled";
645
-	connect = <&vp1_out_edp>;
646
-};
647
717
 
648
718
 &sata2 {
649
719
 	status = "okay";
650
720
 };
651
721
 
652
722
 &sdmmc2 {
653
-	max-frequency = <150000000>;
654
-	supports-sdio;
655
-	bus-width = <4>;
656
-	disable-wp;
657
-	cap-sd-highspeed;
658
-	cap-sdio-irq;
659
-	keep-power-in-suspend;
660
-	mmc-pwrseq = <&sdio_pwrseq>;
661
-	non-removable;
662
-	pinctrl-names = "default";
663
-	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
664
-	sd-uhs-sdr104;
665
-	status = "okay";
723
+        status = "disabled";
724
+};
725
+
726
+&sdmmc1 {
727
+        max-frequency = <150000000>;
728
+        supports-sdio;
729
+        bus-width = <4>;
730
+        disable-wp;
731
+        cap-sd-highspeed;
732
+        cap-sdio-irq;
733
+        keep-power-in-suspend;
734
+        mmc-pwrseq = <&sdio_pwrseq>;
735
+        non-removable;
736
+        pinctrl-names = "default";
737
+        pinctrl-0 = <&sdmmc1_bus4 &sdmmc1_cmd &sdmmc1_clk>;
738
+        sd-uhs-sdr104;
739
+        status = "okay";
666
740
 };
667
741
 
668
742
 &spdif_8ch {
..
..
@@ -695,17 +769,27 @@
695
769
 
696
770
 &wireless_bluetooth {
697
771
 	compatible = "bluetooth-platdata";
698
-	status = "disabled";
772
+	clocks = <&rk809 1>;
773
+	clock-names = "ext_clock";
774
+	//wifi-bt-power-toggle;
775
+	uart_rts_gpios = <&gpio2 RK_PB5 GPIO_ACTIVE_LOW>;
776
+	pinctrl-names = "default", "rts_gpio";
777
+	pinctrl-0 = <&uart1m0_rtsn>;
778
+	pinctrl-1 = <&uart1_gpios>;
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";
699
783
 };
700
784
 
701
785
 &uart0 {
702
-	status = "disabled";
786
+	status = "okay";
703
787
 };
704
788
 
705
789
 &uart1 {	
706
790
 	pinctrl-names = "default";	
707
791
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
708
-	status = "disabled";		
792
+	status = "okay";		
709
793
 };
710
794
 
711
795
 &uart3 {
..
..
@@ -724,11 +808,11 @@
724
808
 };
725
809
 
726
810
 &uart7 {
727
-	status = "disabled";
811
+	status = "okay";
728
812
 	pinctrl-0 = <&uart7m1_xfer>;
729
813
 };
730
814
 
731
815
 &uart9 {
732
-	status = "disabled";
816
+	status = "okay";
733
817
 	pinctrl-0 = <&uart9m1_xfer>;
734
-};
818
+};