Skip to content

Commit f632a43

Browse files
committed
ARM: dts: samsung: exynos4412-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/20230731095730.204567-5-krzysztof.kozlowski@linaro.org Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
1 parent 1222d60 commit f632a43

2 files changed

Lines changed: 10 additions & 12 deletions

File tree

arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -138,13 +138,12 @@
138138
samsung,audio-widgets =
139139
"Headphone", "Headphone Jack",
140140
"Speakers", "Speakers";
141-
samsung,audio-routing =
142-
"Headphone Jack", "HPL",
143-
"Headphone Jack", "HPR",
144-
"Headphone Jack", "MICBIAS",
145-
"IN1", "Headphone Jack",
146-
"Speakers", "SPKL",
147-
"Speakers", "SPKR";
141+
audio-routing = "Headphone Jack", "HPL",
142+
"Headphone Jack", "HPR",
143+
"Headphone Jack", "MICBIAS",
144+
"IN1", "Headphone Jack",
145+
"Speakers", "SPKL",
146+
"Speakers", "SPKR";
148147
};
149148

150149
&spi_1 {

arch/arm/boot/dts/samsung/exynos4412-odroidx.dts

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,8 @@
135135
"Headphone", "Headphone Jack",
136136
"Microphone", "Mic Jack",
137137
"Microphone", "DMIC";
138-
samsung,audio-routing =
139-
"Headphone Jack", "HPL",
140-
"Headphone Jack", "HPR",
141-
"IN1", "Mic Jack",
142-
"Mic Jack", "MICBIAS";
138+
audio-routing = "Headphone Jack", "HPL",
139+
"Headphone Jack", "HPR",
140+
"IN1", "Mic Jack",
141+
"Mic Jack", "MICBIAS";
143142
};

0 commit comments

Comments
 (0)