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,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
 			
..
..
@@ -186,23 +186,48 @@
186
186
 				gpio_function = <1>;
187
187
 			};
188
188
 	#endif
189
-	};
190
-	
191
-			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 {
192
211
 				compatible = "simple-panel";
193
212
 				backlight = <&backlight>;
194
-				power-supply = <&vcc3v3_lcd1_n>;
195
-				enable-gpios = <&gpio2 RK_PD4 GPIO_ACTIVE_HIGH>; //LCD0_VDD_H_GPIO2_D4				
196
-				edp-bl-gpios = <&gpio0 RK_PB7 GPIO_ACTIVE_HIGH>;  //LCD0_PWBLK_H_GPIO0_B7
213
+				power-supply = <&vcc3v3_lcd0_n>;
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
197
217
 				edp-bl-en = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>; //LCD0_BKLT_EN_3V3
198
218
 				bus-format = <MEDIA_BUS_FMT_RGB888_1X24>;
199
219
 				bpc = <8>;
200
220
 				prepare-delay-ms = <200>;
201
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>;
202
227
 
203
228
 				display-timings {
204
-                native-mode = <&timing>;
205
-                timing: timing {
229
+                native-mode = <&timing0>;
230
+                timing0: timing0 {
206
231
 					clock-frequency = <72500000>;
207
232
 					hactive = <1280>;
208
233
 					vactive = <800>;
..
..
@@ -219,8 +244,8 @@
219
244
 					};
220
245
 				};
221
246
 				ports {
222
-					panel_in_lvds: endpoint {
223
-					remote-endpoint = <&lvds_out>;
247
+					panel_in: endpoint {
248
+					remote-endpoint = <&edp_out>;
224
249
 						};
225
250
 					};   
226
251
 				};
..
..
@@ -286,6 +311,10 @@
286
311
  * video_phy0 needs to be enabled
287
312
  * when dsi0 is enabled
288
313
  */
314
+&video_phy0 {
315
+	status = "disabled";
316
+};
317
+
289
318
 &dsi0 {
290
319
 	status = "disabled";
291
320
 };
..
..
@@ -306,6 +335,10 @@
306
335
  * video_phy1 needs to be enabled
307
336
  * when dsi1 is enabled
308
337
  */
338
+ 
339
+&video_phy1 {
340
+	status = "okay";
341
+}; 
309
342
 &dsi1 {
310
343
 	status = "disabled";
311
344
 };
..
..
@@ -315,39 +348,40 @@
315
348
 };
316
349
 
317
350
 &dsi1_in_vp1 {
318
-	status = "disabled";
351
+	status = "okay";
319
352
 };
320
353
 
321
354
 &dsi1_panel {
322
-	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>;
323
361
 };
362
+
363
+&route_dsi1 {
364
+	status = "disabled";
365
+	connect = <&vp1_out_dsi1>;
366
+};
367
+
368
+
369
+/*
370
+*  edp_start
371
+*/
324
372
 
325
373
 &edp {
326
-	//hpd-gpios = <&gpio0 RK_PC2 GPIO_ACTIVE_HIGH>;	
327
374
     force-hpd;
328
-    status = "disabled";
329
-};
330
-
331
-&lvds {
332
375
     status = "okay";
333
376
     ports {
334
377
         port@1 {
335
378
             reg = <1>;
336
-            lvds_out: endpoint {
337
-                remote-endpoint = <&panel_in_lvds>;
379
+            edp_out: endpoint {
380
+                remote-endpoint = <&panel_in>;
338
381
             };
339
382
         };
340
383
    
341
384
 	};
342
-};
343
-
344
-&route_lvds{
345
-	 status = "okay";
346
-	 connect = <&vp2_out_lvds>;
347
-};
348
-
349
-&lvds_in_vp2 {
350
-	status = "okay";
351
385
 };
352
386
 
353
387
 &edp_phy {
..
..
@@ -355,12 +389,61 @@
355
389
 };
356
390
 
357
391
 &edp_in_vp0 {
358
-	status = "disabled";
392
+    status = "disabled";
359
393
 };
360
394
 
361
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 {
362
406
 	status = "okay";
363
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
+*/
364
447
 
365
448
 &gmac0 {
366
449
 	phy-mode = "rgmii";
..
..
@@ -386,7 +469,9 @@
386
469
 	rx_delay = <0x2f>;
387
470
 
388
471
 	phy-handle = <&rgmii_phy0>;
389
-	status = "okay";
472
+	
473
+	status = "disabled";
474
+	
390
475
 };
391
476
 
392
477
 &gmac1 {
..
..
@@ -451,7 +536,6 @@
451
536
 		reset-gpios = <&gpio3 RK_PB6 GPIO_ACTIVE_LOW>;
452
537
 		pwdn-gpios = <&gpio4 RK_PB4 GPIO_ACTIVE_LOW>;
453
538
 		rockchip,grf = <&grf>;
454
-		power-domains = <&power RK3568_PD_VI>;
455
539
 		rockchip,camera-module-index = <0>;
456
540
 		rockchip,camera-module-facing = "back";
457
541
 		rockchip,camera-module-name = "RK-CMK-8M-2-v1";
..
..
@@ -508,6 +592,19 @@
508
592
 	};
509
593
 };
510
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
+
511
608
 &mdio0 {
512
609
 	rgmii_phy0: phy@0 {
513
610
 		compatible = "ethernet-phy-ieee802.3-c22";
..
..
@@ -522,16 +619,10 @@
522
619
 	};
523
620
 };
524
621
 
525
-&video_phy0 {
526
-	status = "okay";
527
-};
528
622
 
529
-&video_phy1 {
530
-	status = "disabled";
531
-};
532
623
 
533
624
 &pcie30phy {
534
-	status = "disabled";
625
+	status = "okay";
535
626
 };
536
627
 
537
628
 &pcie2x1 {
..
..
@@ -540,26 +631,39 @@
540
631
 	status = "okay";
541
632
 };
542
633
 
543
-&pcie3x2 {
544
-	reset-gpios = <&gpio2 RK_PD6 GPIO_ACTIVE_HIGH>;
545
-	vpcie3v3-supply = <&vcc3v3_pcie>;
546
-	status = "okay";
547
-};
548
-
549
634
 &pinctrl {
550
-
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
+//	};
551
642
 	headphone {
552
643
 		hp_det: hp-det {
553
-			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>;
554
646
 		};
555
647
 	};
556
648
 
557
649
 	wireless-wlan {
558
650
 		wifi_host_wake_irq: wifi-host-wake-irq {
559
-			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>;
560
658
 		};
561
659
 	};
562
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
+		
563
667
 	nk_io_init{
564
668
 		nk_io_gpio: nk-io-gpio{
565
669
 			rockchip,pins = <0 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -569,7 +673,7 @@
569
673
 							<4 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
570
674
 							<1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>,
571
675
 							<0 RK_PC7 RK_FUNC_GPIO &pcfg_pull_none>,
572
-							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>, 
676
+							<1 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>,
573
677
 							<1 RK_PB0 RK_FUNC_GPIO &pcfg_pull_none>,
574
678
 							<1 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>,
575
679
 							<3 RK_PA6 RK_FUNC_GPIO &pcfg_pull_none>,
..
..
@@ -585,10 +689,6 @@
585
689
 							<0 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
586
690
 		};
587
691
 	};
588
-};
589
-
590
-&rk809_sound {
591
-	hp-det-gpio = <&gpio3 RK_PC2 GPIO_ACTIVE_LOW>;
592
692
 };
593
693
 
594
694
 &rkisp {
..
..
@@ -613,36 +713,30 @@
613
713
 	};
614
714
 };
615
715
 
616
-&route_dsi0 {
617
-	status = "disabled";
618
-	connect = <&vp1_out_dsi0>;
619
-};
620
716
 
621
-
622
-
623
-&route_edp {
624
-	status = "disabled";
625
-	connect = <&vp1_out_edp>;
626
-};
627
717
 
628
718
 &sata2 {
629
719
 	status = "okay";
630
720
 };
631
721
 
632
722
 &sdmmc2 {
633
-	max-frequency = <150000000>;
634
-	supports-sdio;
635
-	bus-width = <4>;
636
-	disable-wp;
637
-	cap-sd-highspeed;
638
-	cap-sdio-irq;
639
-	keep-power-in-suspend;
640
-	mmc-pwrseq = <&sdio_pwrseq>;
641
-	non-removable;
642
-	pinctrl-names = "default";
643
-	pinctrl-0 = <&sdmmc2m0_bus4 &sdmmc2m0_cmd &sdmmc2m0_clk>;
644
-	sd-uhs-sdr104;
645
-	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";
646
740
 };
647
741
 
648
742
 &spdif_8ch {
..
..
@@ -675,7 +769,17 @@
675
769
 
676
770
 &wireless_bluetooth {
677
771
 	compatible = "bluetooth-platdata";
678
-	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";
679
783
 };
680
784
 
681
785
 &uart0 {
..
..
@@ -685,7 +789,7 @@
685
789
 &uart1 {	
686
790
 	pinctrl-names = "default";	
687
791
 	pinctrl-0 = <&uart1m0_xfer &uart1m0_ctsn>;	
688
-	status = "disabled";		
792
+	status = "okay";		
689
793
 };
690
794
 
691
795
 &uart3 {
..
..
@@ -711,4 +815,4 @@
711
815
 &uart9 {
712
816
 	status = "okay";
713
817
 	pinctrl-0 = <&uart9m1_xfer>;
714
-};
818
+};