Skip to content

Commit a1116f9

Browse files
committed
ARM: dts: samsung: exynos4412-galaxy-s3: switch sound card to audio-routing
"samsung,audio-routing" property is being deprecated, so switch to generic "audio-routing". Link: https://lore.kernel.org/r/20230731095730.204567-3-krzysztof.kozlowski@linaro.org Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1 parent fc730f1 commit a1116f9

1 file changed

Lines changed: 21 additions & 22 deletions

File tree

arch/arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -173,36 +173,35 @@
173173
};
174174

175175
&sound {
176-
samsung,audio-routing =
177-
"HP", "HPOUT1L",
178-
"HP", "HPOUT1R",
176+
audio-routing = "HP", "HPOUT1L",
177+
"HP", "HPOUT1R",
179178

180-
"SPK", "SPKOUTLN",
181-
"SPK", "SPKOUTLP",
182-
"SPK", "SPKOUTRN",
183-
"SPK", "SPKOUTRP",
179+
"SPK", "SPKOUTLN",
180+
"SPK", "SPKOUTLP",
181+
"SPK", "SPKOUTRN",
182+
"SPK", "SPKOUTRP",
184183

185-
"RCV", "HPOUT2N",
186-
"RCV", "HPOUT2P",
184+
"RCV", "HPOUT2N",
185+
"RCV", "HPOUT2P",
187186

188-
"HDMI", "LINEOUT1N",
189-
"HDMI", "LINEOUT1P",
187+
"HDMI", "LINEOUT1N",
188+
"HDMI", "LINEOUT1P",
190189

191-
"LINE", "LINEOUT2N",
192-
"LINE", "LINEOUT2P",
190+
"LINE", "LINEOUT2N",
191+
"LINE", "LINEOUT2P",
193192

194-
"IN1LP", "MICBIAS1",
195-
"IN1LN", "MICBIAS1",
196-
"Main Mic", "MICBIAS1",
193+
"IN1LP", "MICBIAS1",
194+
"IN1LN", "MICBIAS1",
195+
"Main Mic", "MICBIAS1",
197196

198-
"IN1RP", "Sub Mic",
199-
"IN1RN", "Sub Mic",
197+
"IN1RP", "Sub Mic",
198+
"IN1RN", "Sub Mic",
200199

201-
"IN2LP:VXRN", "MICBIAS2",
202-
"Headset Mic", "MICBIAS2",
200+
"IN2LP:VXRN", "MICBIAS2",
201+
"Headset Mic", "MICBIAS2",
203202

204-
"IN2RN", "FM In",
205-
"IN2RP:VXRP", "FM In";
203+
"IN2RN", "FM In",
204+
"IN2RP:VXRP", "FM In";
206205
};
207206

208207
&submic_bias_reg {

0 commit comments

Comments
 (0)