update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi
..
..
@@ -31,6 +31,40 @@
31
31
 		reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
32
32
 	};
33
33
 
34
+	sound {
35
+		compatible = "audio-graph-card";
36
+		label = "Analog";
37
+		dais = <&i2s0_p0>;
38
+	};
39
+
40
+	sound-dit {
41
+		compatible = "audio-graph-card";
42
+		label = "SPDIF";
43
+		dais = <&spdif_p0>;
44
+	};
45
+
46
+	spdif-dit {
47
+		compatible = "linux,spdif-dit";
48
+		#sound-dai-cells = <0>;
49
+
50
+		port {
51
+			dit_p0_0: endpoint {
52
+				remote-endpoint = <&spdif_p0_0>;
53
+			};
54
+		};
55
+	};
56
+
57
+	vbus_typec: vbus-typec-regulator {
58
+		compatible = "regulator-fixed";
59
+		enable-active-high;
60
+		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
61
+		pinctrl-names = "default";
62
+		pinctrl-0 = <&vcc5v0_typec_en>;
63
+		regulator-name = "vbus_typec";
64
+		regulator-always-on;
65
+		vin-supply = <&vcc5v0_sys>;
66
+	};
67
+
34
68
 	vcc12v_dcin: dc-12v {
35
69
 		compatible = "regulator-fixed";
36
70
 		regulator-name = "vcc12v_dcin";
..
..
@@ -40,23 +74,13 @@
40
74
 		regulator-max-microvolt = <12000000>;
41
75
 	};
42
76
 
43
-	vcc5v0_sys: vcc-sys {
77
+	vcc3v3_lan: vcc3v3-lan-regulator {
44
78
 		compatible = "regulator-fixed";
45
-		regulator-name = "vcc5v0_sys";
79
+		regulator-name = "vcc3v3_lan";
46
80
 		regulator-always-on;
47
81
 		regulator-boot-on;
48
-		regulator-min-microvolt = <5000000>;
49
-		regulator-max-microvolt = <5000000>;
50
-		vin-supply = <&vcc12v_dcin>;
51
-	};
52
-
53
-	vcc_0v9: vcc-0v9 {
54
-		compatible = "regulator-fixed";
55
-		regulator-name = "vcc_0v9";
56
-		regulator-always-on;
57
-		regulator-boot-on;
58
-		regulator-min-microvolt = <900000>;
59
-		regulator-max-microvolt = <900000>;
82
+		regulator-min-microvolt = <3300000>;
83
+		regulator-max-microvolt = <3300000>;
60
84
 		vin-supply = <&vcc3v3_sys>;
61
85
 	};
62
86
 
..
..
@@ -93,28 +117,24 @@
93
117
 		vin-supply = <&vcc5v0_sys>;
94
118
 	};
95
119
 
96
-	vcc5v0_typec: vcc5v0-typec-regulator {
120
+	vcc5v0_sys: vcc-sys {
97
121
 		compatible = "regulator-fixed";
98
-		enable-active-high;
99
-		gpio = <&gpio1 RK_PA3 GPIO_ACTIVE_HIGH>;
100
-		pinctrl-names = "default";
101
-		pinctrl-0 = <&vcc5v0_typec_en>;
102
-		regulator-name = "vcc5v0_typec";
103
-		regulator-always-on;
104
-		vin-supply = <&vcc5v0_sys>;
105
-	};
106
-
107
-	vcc_lan: vcc3v3-phy-regulator {
108
-		compatible = "regulator-fixed";
109
-		regulator-name = "vcc_lan";
122
+		regulator-name = "vcc5v0_sys";
110
123
 		regulator-always-on;
111
124
 		regulator-boot-on;
112
-		regulator-min-microvolt = <3300000>;
113
-		regulator-max-microvolt = <3300000>;
125
+		regulator-min-microvolt = <5000000>;
126
+		regulator-max-microvolt = <5000000>;
127
+		vin-supply = <&vcc12v_dcin>;
128
+	};
114
129
 
115
-		regulator-state-mem {
116
-			regulator-off-in-suspend;
117
-		};
130
+	vcc_0v9: vcc-0v9 {
131
+		compatible = "regulator-fixed";
132
+		regulator-name = "vcc_0v9";
133
+		regulator-always-on;
134
+		regulator-boot-on;
135
+		regulator-min-microvolt = <900000>;
136
+		regulator-max-microvolt = <900000>;
137
+		vin-supply = <&vcc3v3_sys>;
118
138
 	};
119
139
 
120
140
 	vdd_log: vdd-log {
..
..
@@ -161,7 +181,7 @@
161
181
 	assigned-clocks = <&cru SCLK_RMII_SRC>;
162
182
 	assigned-clock-parents = <&clkin_gmac>;
163
183
 	clock_in_out = "input";
164
-	phy-supply = <&vcc_lan>;
184
+	phy-supply = <&vcc3v3_lan>;
165
185
 	phy-mode = "rgmii";
166
186
 	pinctrl-names = "default";
167
187
 	pinctrl-0 = <&rgmii_pins>;
..
..
@@ -266,8 +286,8 @@
266
286
 				};
267
287
 			};
268
288
 
269
-			vcc1v8_codec: LDO_REG1 {
270
-				regulator-name = "vcc1v8_codec";
289
+			vcca1v8_codec: LDO_REG1 {
290
+				regulator-name = "vcca1v8_codec";
271
291
 				regulator-always-on;
272
292
 				regulator-boot-on;
273
293
 				regulator-min-microvolt = <1800000>;
..
..
@@ -277,8 +297,8 @@
277
297
 				};
278
298
 			};
279
299
 
280
-			vcc1v8_hdmi: LDO_REG2 {
281
-				regulator-name = "vcc1v8_hdmi";
300
+			vcca1v8_hdmi: LDO_REG2 {
301
+				regulator-name = "vcca1v8_hdmi";
282
302
 				regulator-always-on;
283
303
 				regulator-boot-on;
284
304
 				regulator-min-microvolt = <1800000>;
..
..
@@ -335,8 +355,8 @@
335
355
 				};
336
356
 			};
337
357
 
338
-			vcc0v9_hdmi: LDO_REG7 {
339
-				regulator-name = "vcc0v9_hdmi";
358
+			vcca0v9_hdmi: LDO_REG7 {
359
+				regulator-name = "vcca0v9_hdmi";
340
360
 				regulator-always-on;
341
361
 				regulator-boot-on;
342
362
 				regulator-min-microvolt = <900000>;
..
..
@@ -362,8 +382,6 @@
362
382
 				regulator-name = "vcc_cam";
363
383
 				regulator-always-on;
364
384
 				regulator-boot-on;
365
-				regulator-min-microvolt = <3300000>;
366
-				regulator-max-microvolt = <3300000>;
367
385
 				regulator-state-mem {
368
386
 					regulator-off-in-suspend;
369
387
 				};
..
..
@@ -373,8 +391,6 @@
373
391
 				regulator-name = "vcc_mipi";
374
392
 				regulator-always-on;
375
393
 				regulator-boot-on;
376
-				regulator-min-microvolt = <3300000>;
377
-				regulator-max-microvolt = <3300000>;
378
394
 				regulator-state-mem {
379
395
 					regulator-off-in-suspend;
380
396
 				};
..
..
@@ -425,6 +441,20 @@
425
441
 	i2c-scl-rising-time-ns = <300>;
426
442
 	i2c-scl-falling-time-ns = <15>;
427
443
 	status = "okay";
444
+
445
+	es8316: codec@11 {
446
+		compatible = "everest,es8316";
447
+		reg = <0x11>;
448
+		clocks = <&cru SCLK_I2S_8CH_OUT>;
449
+		clock-names = "mclk";
450
+		#sound-dai-cells = <0>;
451
+
452
+		port {
453
+			es8316_p0_0: endpoint {
454
+				remote-endpoint = <&i2s0_p0_0>;
455
+			};
456
+		};
457
+	};
428
458
 };
429
459
 
430
460
 &i2c3 {
..
..
@@ -443,6 +473,14 @@
443
473
 	rockchip,playback-channels = <8>;
444
474
 	rockchip,capture-channels = <8>;
445
475
 	status = "okay";
476
+
477
+	i2s0_p0: port {
478
+		i2s0_p0_0: endpoint {
479
+			dai-format = "i2s";
480
+			mclk-fs = <256>;
481
+			remote-endpoint = <&es8316_p0_0>;
482
+		};
483
+	};
446
484
 };
447
485
 
448
486
 &i2s1 {
..
..
@@ -455,21 +493,10 @@
455
493
 };
456
494
 
457
495
 &io_domains {
458
-	status = "okay";
459
-
496
+	audio-supply = <&vcca1v8_codec>;
460
497
 	bt656-supply = <&vcc_3v0>;
461
-	audio-supply = <&vcc1v8_codec>;
462
-	sdmmc-supply = <&vcc_sdio>;
463
498
 	gpio1830-supply = <&vcc_3v0>;
464
-};
465
-
466
-&pmu_io_domains {
467
-	status = "okay";
468
-
469
-	pmu1830-supply = <&vcc_3v0>;
470
-};
471
-
472
-&pcie_phy {
499
+	sdmmc-supply = <&vcc_sdio>;
473
500
 	status = "okay";
474
501
 };
475
502
 
..
..
@@ -482,6 +509,10 @@
482
509
 	vpcie0v9-supply = <&vcc_0v9>;
483
510
 	vpcie1v8-supply = <&vcc_1v8>;
484
511
 	vpcie3v3-supply = <&vcc3v3_pcie>;
512
+	status = "okay";
513
+};
514
+
515
+&pcie_phy {
485
516
 	status = "okay";
486
517
 };
487
518
 
..
..
@@ -506,6 +537,20 @@
506
537
 		};
507
538
 	};
508
539
 
540
+	pmic {
541
+		pmic_int_l: pmic-int-l {
542
+			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
543
+		};
544
+
545
+		vsel1_pin: vsel1-pin {
546
+			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
547
+		};
548
+
549
+		vsel2_pin: vsel2-pin {
550
+			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
551
+		};
552
+	};
553
+
509
554
 	sdio0 {
510
555
 		sdio0_bus4: sdio0-bus4 {
511
556
 			rockchip,pins = <2 RK_PC4 1 &pcfg_pull_up_20ma>,
..
..
@@ -520,20 +565,6 @@
520
565
 
521
566
 		sdio0_clk: sdio0-clk {
522
567
 			rockchip,pins = <2 RK_PD1 1 &pcfg_pull_none_20ma>;
523
-		};
524
-	};
525
-
526
-	pmic {
527
-		pmic_int_l: pmic-int-l {
528
-			rockchip,pins = <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
529
-		};
530
-
531
-		vsel1_pin: vsel1-pin {
532
-			rockchip,pins = <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
533
-		};
534
-
535
-		vsel2_pin: vsel2-pin {
536
-			rockchip,pins = <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
537
568
 		};
538
569
 	};
539
570
 
..
..
@@ -560,6 +591,11 @@
560
591
 	};
561
592
 };
562
593
 
594
+&pmu_io_domains {
595
+	pmu1830-supply = <&vcc_3v0>;
596
+	status = "okay";
597
+};
598
+
563
599
 &pwm2 {
564
600
 	status = "okay";
565
601
 };
..
..
@@ -568,6 +604,14 @@
568
604
 	status = "okay";
569
605
 
570
606
 	vref-supply = <&vcc_1v8>;
607
+};
608
+
609
+&sdhci {
610
+	max-frequency = <150000000>;
611
+	bus-width = <8>;
612
+	mmc-hs200-1_8v;
613
+	non-removable;
614
+	status = "okay";
571
615
 };
572
616
 
573
617
 &sdio0 {
..
..
@@ -597,12 +641,13 @@
597
641
 	status = "okay";
598
642
 };
599
643
 
600
-&sdhci {
601
-	bus-width = <8>;
602
-	mmc-hs400-1_8v;
603
-	mmc-hs400-enhanced-strobe;
604
-	non-removable;
605
-	status = "okay";
644
+&spdif {
645
+
646
+	spdif_p0: port {
647
+		spdif_p0_0: endpoint {
648
+			remote-endpoint = <&dit_p0_0>;
649
+		};
650
+	};
606
651
 };
607
652
 
608
653
 &tcphy0 {
..
..
@@ -677,15 +722,15 @@
677
722
 	status = "okay";
678
723
 };
679
724
 
680
-&usbdrd_dwc3_0 {
681
-	status = "okay";
682
-	dr_mode = "otg";
683
-};
684
-
685
725
 &usbdrd3_1 {
686
726
 	status = "okay";
687
727
 };
688
728
 
729
+&usbdrd_dwc3_0 {
730
+	status = "okay";
731
+	dr_mode = "host";
732
+};
733
+
689
734
 &usbdrd_dwc3_1 {
690
735
 	status = "okay";
691
736
 	dr_mode = "host";