ARM: dts: sun8i: a33: Update codec widget names

The sun8i-codec driver introduced a new set of DAPM widgets that more
accurately describe the hardware topology. Update the various device
trees to use the new widget names.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
Link: https://lore.kernel.org/r/20200726012557.38282-6-samuel@sholland.org

diff --git a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
index 3d78169cdeedf194ecd2246b89514f24e4719ae5..a1953b2872d03363578781fb11949c24c13e5755 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
+++ b/arch/arm/boot/dts/sun8i-a33-olinuxino.dts
@@ -194,8 +194,8 @@
                                    "Headphone", "Headphone Jack";
        /* Board level routing. First 2 routes copied from SoC level */
        simple-audio-card,routing =
-               "Left DAC", "AIF1 Slot 0 Left",
-               "Right DAC", "AIF1 Slot 0 Right",
+               "Left DAC", "DACL",
+               "Right DAC", "DACR",
                "HP", "HPCOM",
                "Headphone Jack", "HP",
                "MIC1", "Microphone Jack",

diff --git a/arch/arm/boot/dts/sun8i-a33.dtsi b/arch/arm/boot/dts/sun8i-a33.dtsi
index cfd3858afb3ebfd502206202323933f9ac67b937..c458f5fb124fb248b385a99589febaa9b1c3d352 100644 (file)
--- a/arch/arm/boot/dts/sun8i-a33.dtsi
+++ b/arch/arm/boot/dts/sun8i-a33.dtsi
@@ -189,8 +189,8 @@
                simple-audio-card,mclk-fs = <128>;
                simple-audio-card,aux-devs = <&codec_analog>;
                simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right";
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR";
                status = "disabled";
 
                simple-audio-card,cpu {