Skip to content

Commit ec32dc6

Browse files
author
Sugar Zhang
committed
arm: dts: rk3288-android: enable built-in hdmi and rt5640 sound
This patch use one cpudai->multicodecs card for built-in hdmi and external codec which share the same i2s controller. Change-Id: Ib56d7f10b6739b1c26ec8946470b9f0cd7215979 Signed-off-by: Sugar Zhang <sugar.zhang@rock-chips.com>
1 parent e66d174 commit ec32dc6

6 files changed

Lines changed: 35 additions & 1 deletion

File tree

arch/arm/boot/dts/rk3288-android.dtsi

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,23 @@
257257
clock-names = "clk_nandc", "hclk_nandc";
258258
status = "disabled";
259259
};
260+
261+
hdmi_analog_sound: hdmi-analog-sound {
262+
status = "disabled";
263+
compatible = "rockchip,rk3288-hdmi-analog",
264+
"rockchip,rk3368-hdmi-analog";
265+
rockchip,cpu = <&i2s>;
266+
rockchip,codec = <&rt5640>, <&hdmi>;
267+
rockchip,widgets =
268+
"Microphone", "Microphone Jack",
269+
"Headphone", "Headphone Jack";
270+
rockchip,routing =
271+
"MIC1", "Microphone Jack",
272+
"MIC2", "Microphone Jack",
273+
"Microphone Jack", "micbias1",
274+
"Headphone Jack", "HPOL",
275+
"Headphone Jack", "HPOR";
276+
};
260277
};
261278

262279
&edp_panel {

arch/arm/boot/dts/rk3288-evb-act8846-edp.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,10 @@
9696
mali-supply = <&vdd_gpu>;
9797
};
9898

99+
&hdmi_analog_sound {
100+
status = "okay";
101+
};
102+
99103
&i2c0 {
100104
clock-frequency = <400000>;
101105

arch/arm/boot/dts/rk3288-evb-rk808.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,10 @@
7373
cpu0-supply = <&vdd_cpu>;
7474
};
7575

76+
&hdmi_analog_sound {
77+
status = "okay";
78+
};
79+
7680
&i2c0 {
7781
clock-frequency = <400000>;
7882

arch/arm/boot/dts/rk3288-evb-rk818-edp.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,10 @@
130130
mali-supply = <&vdd_gpu>;
131131
};
132132

133+
&hdmi_analog_sound {
134+
status = "okay";
135+
};
136+
133137
&i2c0 {
134138
clock-frequency = <400000>;
135139

arch/arm/boot/dts/rk3288-evb-rk818-mipi.dts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,10 @@
9292
mali-supply = <&vdd_gpu>;
9393
};
9494

95+
&hdmi_analog_sound {
96+
status = "okay";
97+
};
98+
9599
&i2c0 {
96100
clock-frequency = <400000>;
97101

arch/arm/boot/dts/rk3288-evb.dtsi

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,8 @@
5959
};
6060
};
6161

62-
sound {
62+
sound: sound {
63+
status = "disabled";
6364
compatible = "simple-audio-card";
6465
simple-audio-card,format = "i2s";
6566
simple-audio-card,name = "rockchip,rt5640-codec";

0 commit comments

Comments
 (0)