Skip to content

Commit fc730f1

Browse files
committed
ARM: dts: samsung: exynos4212-tab3: 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-2-krzysztof.kozlowski@linaro.org Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1 parent 0bb80ec commit fc730f1

1 file changed

Lines changed: 20 additions & 21 deletions

File tree

arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -300,34 +300,33 @@
300300
mic-bias-supply = <&mic_bias_reg>;
301301
submic-bias-supply = <&submic_bias_reg>;
302302

303-
samsung,audio-routing =
304-
"HP", "HPOUT1L",
305-
"HP", "HPOUT1R",
303+
audio-routing = "HP", "HPOUT1L",
304+
"HP", "HPOUT1R",
306305

307-
"SPK", "SPKOUTLN",
308-
"SPK", "SPKOUTLP",
309-
"SPK", "SPKOUTRN",
310-
"SPK", "SPKOUTRP",
306+
"SPK", "SPKOUTLN",
307+
"SPK", "SPKOUTLP",
308+
"SPK", "SPKOUTRN",
309+
"SPK", "SPKOUTRP",
311310

312-
"RCV", "HPOUT2N",
313-
"RCV", "HPOUT2P",
311+
"RCV", "HPOUT2N",
312+
"RCV", "HPOUT2P",
314313

315-
"LINE", "LINEOUT2N",
316-
"LINE", "LINEOUT2P",
314+
"LINE", "LINEOUT2N",
315+
"LINE", "LINEOUT2P",
317316

318-
"HDMI", "LINEOUT1N",
319-
"HDMI", "LINEOUT1P",
317+
"HDMI", "LINEOUT1N",
318+
"HDMI", "LINEOUT1P",
320319

321-
"IN2LP:VXRN", "MICBIAS1",
322-
"IN2LN", "MICBIAS1",
323-
"Main Mic", "MICBIAS1",
320+
"IN2LP:VXRN", "MICBIAS1",
321+
"IN2LN", "MICBIAS1",
322+
"Main Mic", "MICBIAS1",
324323

325-
"IN1RP", "MICBIAS2",
326-
"IN1RN", "MICBIAS2",
327-
"Sub Mic", "MICBIAS2",
324+
"IN1RP", "MICBIAS2",
325+
"IN1RN", "MICBIAS2",
326+
"Sub Mic", "MICBIAS2",
328327

329-
"IN1LP", "Headset Mic",
330-
"IN1LN", "Headset Mic";
328+
"IN1LP", "Headset Mic",
329+
"IN1LN", "Headset Mic";
331330

332331
cpu {
333332
sound-dai = <&i2s0 0>;

0 commit comments

Comments
 (0)