projects / linux.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 44967e8)
arm64: dts: allwinner: a64: Update codec widget names
authorSamuel Holland <samuel@sholland.org>
Sun, 26 Jul 2020 01:25:56 +0000 (20:25 -0500)
committerMaxime Ripard <maxime@cerno.tech>
Thu, 17 Sep 2020 16:37:31 +0000 (18:37 +0200)
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-7-samuel@sholland.org
arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts patch | blob | history
arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi patch | blob | history

diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
index 883f217efb8121f49c05b4d63eb468edebf0aeda..3ea5182ca4894a5e965025d4292ed8e927a5757c 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-bananapi-m64.dts
@@ -331,10 +331,10 @@
                                    "Microphone", "Microphone Jack",
                                    "Microphone", "Onboard Microphone";
        simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "Headphone Jack", "HP",
                        "MIC2", "Microphone Jack",
                        "Onboard Microphone", "MBIAS",
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
index fde9c7a99b17e5b116576d201145c097704a51f3..d894ec5fa8a1fa115701698797e89e8345573940 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-orangepi-win.dts
@@ -330,10 +330,10 @@
                                    "Microphone", "Microphone Jack",
                                    "Microphone", "Onboard Microphone";
        simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "Headphone Jack", "HP",
                        "MIC2", "Microphone Jack",
                        "Onboard Microphone", "MBIAS",
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
index 2165f238af13cc77a0a84ead3312a3886ef11646..329cf276561e896bbc193eb26208d4348e03c74d 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pine64.dts
@@ -261,11 +261,11 @@
        simple-audio-card,widgets = "Microphone", "Microphone Jack",
                                    "Headphone", "Headphone Jack";
        simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
                        "Headphone Jack", "HP",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "MIC2", "Microphone Jack";
        status = "okay";
 };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
index 64b1c54f87c0a7a4c79a81626deecc7b77f3b458..896f34fd9fc3a896f3c8cbe06cf92d04d27adeb0 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinebook.dts
@@ -374,15 +374,15 @@
                                    "Headphone", "Headphone Jack",
                                    "Speaker", "Internal Speaker";
        simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
                        "Speaker Amp INL", "LINEOUT",
                        "Speaker Amp INR", "LINEOUT",
                        "Internal Speaker", "Speaker Amp OUTL",
                        "Internal Speaker", "Speaker Amp OUTR",
                        "Headphone Jack", "HP",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "Internal Microphone Left", "MBIAS",
                        "MIC1", "Internal Microphone Left",
                        "Internal Microphone Right", "HBIAS",
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
index 25150aba749dceca778fb0943fc64ae8a682bd52..5780713b0dba079f62d4b58097862efa09f20d0a 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinephone.dtsi
@@ -392,10 +392,10 @@
                        "Internal Speaker", "Speaker Amp OUTR",
                        "Speaker Amp INL", "LINEOUT",
                        "Speaker Amp INR", "LINEOUT",
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "Internal Microphone", "MBIAS",
                        "MIC1", "Internal Microphone",
                        "Headset Microphone", "HBIAS",
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
index dc4ab6b434f9700ab855bd0f1b6fe1dd57ca94e1..3ab0f0347bc99d9e56ea558dccf440d1dd0fee63 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-pinetab.dts
@@ -421,15 +421,15 @@
                                    "Headphone", "Headphone Jack",
                                    "Speaker", "Internal Speaker";
        simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
                        "Speaker Amp INL", "LINEOUT",
                        "Speaker Amp INR", "LINEOUT",
                        "Internal Speaker", "Speaker Amp OUTL",
                        "Internal Speaker", "Speaker Amp OUTR",
                        "Headphone Jack", "HP",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "Internal Microphone Left", "MBIAS",
                        "MIC1", "Internal Microphone Left",
                        "Internal Microphone Right", "HBIAS",
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
index 2f6ea9f3f6a2a0e5762c07412ee9d6251935413e..9ebb9e07fae327c2c8c2e523355269ee81a6e2fb 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-sopine-baseboard.dts
@@ -159,11 +159,11 @@
        simple-audio-card,widgets = "Microphone", "Microphone Jack",
                                    "Headphone", "Headphone Jack";
        simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
                        "Headphone Jack", "HP",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "MIC2", "Microphone Jack";
        status = "okay";
 };
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
index f5df5f705b72ae6dead0cfde7e672992030ea7bc..a1864a89fb897ce7081c09966a0aa6c68884c4a4 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64-teres-i.dts
@@ -340,10 +340,10 @@
                                    "Microphone", "Internal Microphone",
                                    "Speaker", "Internal Speaker";
        simple-audio-card,routing =
-                       "Left DAC", "AIF1 Slot 0 Left",
-                       "Right DAC", "AIF1 Slot 0 Right",
-                       "AIF1 Slot 0 Left ADC", "Left ADC",
-                       "AIF1 Slot 0 Right ADC", "Right ADC",
+                       "Left DAC", "DACL",
+                       "Right DAC", "DACR",
+                       "ADCL", "Left ADC",
+                       "ADCR", "Right ADC",
                        "Headphone Jack", "HP",
                        "Speaker Amp INL", "LINEOUT",
                        "Speaker Amp INR", "LINEOUT",
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
index cf379e38b3a038672291a7bc411c056b6f19406b..88758af183698f7f0052593076fd3409fc17e25a 100644 (file)
--- a/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi
@@ -139,10 +139,10 @@
                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",
-                               "AIF1 Slot 0 Left ADC", "Left ADC",
-                               "AIF1 Slot 0 Right ADC", "Right ADC";
+                               "Left DAC", "DACL",
+                               "Right DAC", "DACR",
+                               "ADCL", "Left ADC",
+                               "ADCR", "Right ADC";
                status = "disabled";
 
                cpudai: simple-audio-card,cpu {
ep93xx device tree rework repo: git://git.maquefel.me/linux.git