Skip to content

Commit c670e7c

Browse files
committed
ARM: dts: samsung: exynos5422-odroid: 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/[email protected] Signed-off-by: Krzysztof Kozlowski <[email protected]>
1 parent f632a43 commit c670e7c

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

arch/arm/boot/dts/samsung/exynos5422-odroidxu3-audio.dtsi

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,15 @@
1818
samsung,audio-widgets =
1919
"Headphone", "Headphone Jack",
2020
"Speakers", "Speakers";
21-
samsung,audio-routing =
22-
"Headphone Jack", "HPL",
23-
"Headphone Jack", "HPR",
24-
"Headphone Jack", "MICBIAS",
25-
"IN12", "Headphone Jack",
26-
"Speakers", "SPKL",
27-
"Speakers", "SPKR",
28-
"I2S Playback", "Mixer DAI TX",
29-
"HiFi Playback", "Mixer DAI TX",
30-
"Mixer DAI RX", "HiFi Capture";
21+
audio-routing = "Headphone Jack", "HPL",
22+
"Headphone Jack", "HPR",
23+
"Headphone Jack", "MICBIAS",
24+
"IN12", "Headphone Jack",
25+
"Speakers", "SPKL",
26+
"Speakers", "SPKR",
27+
"I2S Playback", "Mixer DAI TX",
28+
"HiFi Playback", "Mixer DAI TX",
29+
"Mixer DAI RX", "HiFi Capture";
3130

3231
cpu {
3332
sound-dai = <&i2s0 0>, <&i2s0 1>;

arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
compatible = "samsung,odroid-xu3-audio";
3636
model = "Odroid-XU4";
3737

38-
samsung,audio-routing = "I2S Playback", "Mixer DAI TX";
38+
audio-routing = "I2S Playback", "Mixer DAI TX";
3939

4040
cpu {
4141
sound-dai = <&i2s0 0>, <&i2s0 1>;

0 commit comments

Comments
 (0)