diff options
| author |   Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-07-31 11:57:27 +0200 |
|---|---|---|
| committer | Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> | 2023-09-11 13:36:28 +0200 |
| commit | f632a4376134722cb16c78d819505aedd9c0d8e3 (patch) | |
| tree | 84eff852c44282285972d6c7e29777e49562a436 | |
| parent | ARM: dts: samsung: exynos4412-n710x: switch sound card to audio-routing (diff) | |
| download | wireguard-linux-f632a4376134722cb16c78d819505aedd9c0d8e3.tar.xz wireguard-linux-f632a4376134722cb16c78d819505aedd9c0d8e3.zip | |
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>
| -rw-r--r-- | arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts | 13 | ||||
| -rw-r--r-- | arch/arm/boot/dts/samsung/exynos4412-odroidx.dts | 9 |
2 files changed, 10 insertions, 12 deletions
diff --git a/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts b/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts index 42812da1f882..b1b0916b1505 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts +++ b/arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts @@ -138,13 +138,12 @@ samsung,audio-widgets = "Headphone", "Headphone Jack", "Speakers", "Speakers"; - samsung,audio-routing = - "Headphone Jack", "HPL", - "Headphone Jack", "HPR", - "Headphone Jack", "MICBIAS", - "IN1", "Headphone Jack", - "Speakers", "SPKL", - "Speakers", "SPKR"; + audio-routing = "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "Headphone Jack", "MICBIAS", + "IN1", "Headphone Jack", + "Speakers", "SPKL", + "Speakers", "SPKR"; }; &spi_1 { diff --git a/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts b/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts index d5316cf2fbb6..0eb8a2680a20 100644 --- a/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts +++ b/arch/arm/boot/dts/samsung/exynos4412-odroidx.dts @@ -135,9 +135,8 @@ "Headphone", "Headphone Jack", "Microphone", "Mic Jack", "Microphone", "DMIC"; - samsung,audio-routing = - "Headphone Jack", "HPL", - "Headphone Jack", "HPR", - "IN1", "Mic Jack", - "Mic Jack", "MICBIAS"; + audio-routing = "Headphone Jack", "HPL", + "Headphone Jack", "HPR", + "IN1", "Mic Jack", + "Mic Jack", "MICBIAS"; }; |