kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/arch/arm/boot/dts/rk3288-evb.dtsi
..
..
@@ -47,43 +47,49 @@
47
47
 		};
48
48
 	};
49
49
 
50
-	sound: sound {
51
-		compatible = "simple-audio-card";
52
-		simple-audio-card,format = "i2s";
53
-		simple-audio-card,name = "rockchip,rt5640-codec";
54
-		simple-audio-card,mclk-fs = <512>;
50
+	rt5640_sound: rt5640-sound {
55
51
 		status = "okay";
56
-
57
-		simple-audio-card,dai-link@0 {
58
-			format = "i2s";
59
-			cpu {
60
-				sound-dai = <&i2s>;
61
-			};
62
-
63
-			codec {
64
-				sound-dai = <&rt5640>;
65
-			};
66
-		};
67
-
68
-		simple-audio-card,dai-link@1 {
69
-			format = "i2s";
70
-			cpu {
71
-				sound-dai = <&i2s>;
72
-			};
73
-
74
-			codec {
75
-				sound-dai = <&hdmi>;
76
-			};
52
+		compatible = "rockchip,multicodecs-card";
53
+		rockchip,card-name = "rockchip-rt5640";
54
+		hp-det-gpio = <&gpio7 RK_PA7 GPIO_ACTIVE_HIGH>;
55
+		io-channels = <&saradc 2>;
56
+		io-channel-names = "adc-detect";
57
+		keyup-threshold-microvolt = <1800000>;
58
+		poll-interval = <100>;
59
+		rockchip,format = "i2s";
60
+		rockchip,mclk-fs = <512>;
61
+		rockchip,cpu = <&i2s>;
62
+		rockchip,codec = <&rt5640>;
63
+		rockchip,audio-routing =
64
+			"Headphone", "HPOL",
65
+			"Headphone", "HPOR",
66
+			"Speaker", "SPOLP",
67
+			"Speaker", "SPOLN",
68
+			"Speaker", "SPORP",
69
+			"Speaker", "SPORN",
70
+			"Headphone", "Headphone Power",
71
+			"Headphone", "Headphone Power",
72
+			"Speaker", "Speaker Power",
73
+			"Speaker", "Speaker Power",
74
+			"DMIC L1", "Main Mic",
75
+			"DMIC R1", "Main Mic",
76
+			"IN3P", "Headset Mic",
77
+			"Headset Mic", "MICBIAS1";
78
+		play-pause-key {
79
+			label = "playpause";
80
+			linux,code = <KEY_PLAYPAUSE>;
81
+			press-threshold-microvolt = <2000>;
77
82
 		};
78
83
 	};
79
84
 
80
-	hdmi_analog_sound: hdmi-analog-sound {
81
-		compatible = "rockchip,rk3288-hdmi-analog",
82
-			     "rockchip,rk3368-hdmi-analog";
83
-		rockchip,model = "rockchip,rt5640-codec";
84
-		rockchip,cpu = <&i2s>;
85
-		rockchip,codec = <&rt5640>, <&hdmi>;
85
+	hdmi_sound: hdmi-sound {
86
86
 		status = "disabled";
87
+		compatible = "rockchip,hdmi";
88
+		rockchip,mclk-fs = <256>;
89
+		rockchip,card-name = "rockchip-hdmi0";
90
+		rockchip,cpu = <&i2s>;
91
+		rockchip,codec = <&hdmi>;
92
+		rockchip,jack-det;
87
93
 	};
88
94
 
89
95
 	backlight: backlight {
..
..
@@ -368,8 +374,6 @@
368
374
 		reg = <0x1c>;
369
375
 		clocks = <&cru SCLK_I2S0_OUT>;
370
376
 		clock-names = "mclk";
371
-		interrupt-parent = <&gpio7>;
372
-		interrupts = <7 IRQ_TYPE_EDGE_FALLING>;
373
377
 		pinctrl-names = "default";
374
378
 		pinctrl-0 = <&i2s0_mclk>;
375
379
 	};