Skip to content

Commit 80c2145

Browse files
jbrun3tkhilman
authored andcommitted
arm64: dts: meson: vim3l: remove sound card definition
The sound card definition should have been removed when the common definition was added to the vim3 dtsi but this slips through. Remove it now. Fixes: 7c9c062 ("arm64: dts: meson: vim3: make sound card common to all variants") Signed-off-by: Jerome Brunet <[email protected]> Signed-off-by: Kevin Hilman <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent 7c9c062 commit 80c2145

File tree

1 file changed

+0
-86
lines changed

1 file changed

+0
-86
lines changed

arch/arm64/boot/dts/amlogic/meson-sm1-khadas-vim3l.dts

Lines changed: 0 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -32,69 +32,6 @@
3232
regulator-boot-on;
3333
regulator-always-on;
3434
};
35-
36-
sound {
37-
compatible = "amlogic,axg-sound-card";
38-
model = "SM1-KHADAS-VIM3L";
39-
audio-aux-devs = <&tdmout_a>;
40-
audio-routing = "TDMOUT_A IN 0", "FRDDR_A OUT 0",
41-
"TDMOUT_A IN 1", "FRDDR_B OUT 0",
42-
"TDMOUT_A IN 2", "FRDDR_C OUT 0",
43-
"TDM_A Playback", "TDMOUT_A OUT";
44-
45-
assigned-clocks = <&clkc CLKID_MPLL2>,
46-
<&clkc CLKID_MPLL0>,
47-
<&clkc CLKID_MPLL1>;
48-
assigned-clock-parents = <0>, <0>, <0>;
49-
assigned-clock-rates = <294912000>,
50-
<270950400>,
51-
<393216000>;
52-
status = "okay";
53-
54-
dai-link-0 {
55-
sound-dai = <&frddr_a>;
56-
};
57-
58-
dai-link-1 {
59-
sound-dai = <&frddr_b>;
60-
};
61-
62-
dai-link-2 {
63-
sound-dai = <&frddr_c>;
64-
};
65-
66-
/* 8ch hdmi interface */
67-
dai-link-3 {
68-
sound-dai = <&tdmif_a>;
69-
dai-format = "i2s";
70-
dai-tdm-slot-tx-mask-0 = <1 1>;
71-
dai-tdm-slot-tx-mask-1 = <1 1>;
72-
dai-tdm-slot-tx-mask-2 = <1 1>;
73-
dai-tdm-slot-tx-mask-3 = <1 1>;
74-
mclk-fs = <256>;
75-
76-
codec {
77-
sound-dai = <&tohdmitx TOHDMITX_I2S_IN_A>;
78-
};
79-
};
80-
81-
/* hdmi glue */
82-
dai-link-4 {
83-
sound-dai = <&tohdmitx TOHDMITX_I2S_OUT>;
84-
85-
codec {
86-
sound-dai = <&hdmi_tx>;
87-
};
88-
};
89-
};
90-
};
91-
92-
&arb {
93-
status = "okay";
94-
};
95-
96-
&clkc_audio {
97-
status = "okay";
9835
};
9936

10037
&cpu0 {
@@ -125,18 +62,6 @@
12562
clock-latency = <50000>;
12663
};
12764

128-
&frddr_a {
129-
status = "okay";
130-
};
131-
132-
&frddr_b {
133-
status = "okay";
134-
};
135-
136-
&frddr_c {
137-
status = "okay";
138-
};
139-
14065
&pwm_AO_cd {
14166
pinctrl-0 = <&pwm_ao_d_e_pins>;
14267
pinctrl-names = "default";
@@ -174,14 +99,3 @@
17499
};
175100
*/
176101

177-
&tdmif_a {
178-
status = "okay";
179-
};
180-
181-
&tdmout_a {
182-
status = "okay";
183-
};
184-
185-
&tohdmitx {
186-
status = "okay";
187-
};

0 commit comments

Comments
 (0)