ASoC: sun8i-codec: Fix DAPM to match the hardware topology

The A33/A64 digital codec has 4 physical inputs and 4 physical outputs:
3 AIFs/DAIs and one ADC/DAC pair. Internal routing is accomplished by
a 4-channel mixer connected to each output.

The analog and digital sides of the ADC/DAC are in separate ASoC
components, so card-level DAPM routes (provided in the device tree) are
necessary to connect them together. Currently, these routes are wrong.

For AIF1 Playback, the correct topology is:

         ||<<============ sun8i-codec ===========>>||
         ||                                        ||
 CPU DAI -> AIF1 DA0 -> DAC Mixer -> DAC (digital) -> DAC (analog)
         ||                                        ||

but the driver and device trees currently describe:

         ||                                        ||
 CPU DAI -> AIF1 DA0 -------------------------------> DAC (analog)
         ||     \--> DAC Mixer -> ??? [dead end]   ||

For AIF1 Capture, there is an additional problem, because the Mixer
route is backward. The topology should be:

              ||                                             ||
 ADC (analog) -> ADC (digital) -> AIF1 AD0 Mixer -> AIF1 AD0 -> CPU DAI
              ||                                             ||

but the driver and device trees currently describe:

              ||                                             ||
 ADC (analog) -> AIF1 AD0 ------------------------------------> CPU DAI
              ||     \--> ADC Mixer -> ??? [dead end]        ||

The ADC/DAC are only powered because AIF1 AD0 (capture) has supply
routes from the ADC, and AIF1 DA0 (playback) has supply routes from the
DAC. However, neither set of supply routes matches the hardware
topology. Audio can be routed among AIF1/2/3 without using the ADC or
DAC at all; and audio can be routed from the ADC to the DAC without
using any AIFs (via the "ADC Digital DAC Playback Switch"). Because the
DAPM routes are wrong, both of these use cases are currently broken.

This commit adds the necessary widgets and routes to represent the real
hardware topology, with functionality equivalent to the current driver.

For the existing "allwinner,sun8i-a33-codec" compatible, widgets with
the old names are kept as wrappers around the new widgets, so existing
device trees will continue to work. For "allwinner,sun50i-a64-codec",
the old widgets can be omitted, because no device trees yet use that
compatible.

Signed-off-by: Samuel Holland <samuel@sholland.org>
Link: https://lore.kernel.org/r/20200726012557.38282-3-samuel@sholland.org
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sunxi/sun8i-codec.c b/sound/soc/sunxi/sun8i-codec.c
index ca51af1144198681cb1a18b822e1c7d5d84082cc..ffeac150c08608b35f2008101fc2f1b244e621e9 100644 (file)
--- a/sound/soc/sunxi/sun8i-codec.c
+++ b/sound/soc/sunxi/sun8i-codec.c
@@ -13,6 +13,7 @@
 #include <linux/delay.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/of_device.h>
 #include <linux/pm_runtime.h>
 #include <linux/regmap.h>
 #include <linux/log2.h>
@@ -85,10 +86,15 @@
 #define SUN8I_AIF1CLK_CTRL_AIF1_LRCK_DIV_MASK  GENMASK(8, 6)
 #define SUN8I_AIF1CLK_CTRL_AIF1_BCLK_DIV_MASK  GENMASK(12, 9)
 
+struct sun8i_codec_quirks {
+       bool legacy_widgets     : 1;
+};
+
 struct sun8i_codec {
-       struct regmap   *regmap;
-       struct clk      *clk_module;
-       struct clk      *clk_bus;
+       struct regmap                   *regmap;
+       struct clk                      *clk_module;
+       struct clk                      *clk_bus;
+       const struct sun8i_codec_quirks *quirks;
 };
 
 static int sun8i_codec_runtime_resume(struct device *dev)
@@ -388,22 +394,30 @@ static const struct snd_soc_dapm_widget sun8i_codec_dapm_widgets[] = {
        SND_SOC_DAPM_SUPPLY("ADC", SUN8I_ADC_DIG_CTRL, SUN8I_ADC_DIG_CTRL_ENDA,
                            0, NULL, 0),
 
-       /* Analog DAC AIF */
-       SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left", "Playback", 0,
+       /* AIF "DAC" Inputs */
+       SND_SOC_DAPM_AIF_IN("AIF1 DA0L", "Playback", 0,
                            SUN8I_AIF1_DACDAT_CTRL,
                            SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0L_ENA, 0),
-       SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right", "Playback", 0,
+       SND_SOC_DAPM_AIF_IN("AIF1 DA0R", "Playback", 0,
                            SUN8I_AIF1_DACDAT_CTRL,
                            SUN8I_AIF1_DACDAT_CTRL_AIF1_DA0R_ENA, 0),
 
-       /* Analog ADC AIF */
-       SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Left ADC", "Capture", 0,
+       /* AIF "ADC" Outputs */
+       SND_SOC_DAPM_AIF_IN("AIF1 AD0L", "Capture", 0,
                            SUN8I_AIF1_ADCDAT_CTRL,
                            SUN8I_AIF1_ADCDAT_CTRL_AIF1_DA0L_ENA, 0),
-       SND_SOC_DAPM_AIF_IN("AIF1 Slot 0 Right ADC", "Capture", 0,
+       SND_SOC_DAPM_AIF_IN("AIF1 AD0R", "Capture", 0,
                            SUN8I_AIF1_ADCDAT_CTRL,
                            SUN8I_AIF1_ADCDAT_CTRL_AIF1_DA0R_ENA, 0),
 
+       /* ADC Inputs (connected to analog codec DAPM context) */
+       SND_SOC_DAPM_ADC("ADCL", NULL, SND_SOC_NOPM, 0, 0),
+       SND_SOC_DAPM_ADC("ADCR", NULL, SND_SOC_NOPM, 0, 0),
+
+       /* DAC Outputs (connected to analog codec DAPM context) */
+       SND_SOC_DAPM_DAC("DACL", NULL, SND_SOC_NOPM, 0, 0),
+       SND_SOC_DAPM_DAC("DACR", NULL, SND_SOC_NOPM, 0, 0),
+
        /* DAC and ADC Mixers */
        SOC_MIXER_ARRAY("Left Digital DAC Mixer", SND_SOC_NOPM, 0, 0,
                        sun8i_dac_mixer_controls),
@@ -449,40 +463,86 @@ static const struct snd_soc_dapm_route sun8i_codec_dapm_routes[] = {
        /* Clock Routes */
        { "AIF1", NULL, "SYSCLK AIF1" },
        { "AIF1 PLL", NULL, "AIF1" },
-       { "RST AIF1", NULL, "AIF1 PLL" },
+       { "SYSCLK", NULL, "AIF1 PLL" },
+
+       { "RST AIF1", NULL, "SYSCLK" },
        { "MODCLK AFI1", NULL, "RST AIF1" },
-       { "DAC", NULL, "MODCLK AFI1" },
-       { "ADC", NULL, "MODCLK AFI1" },
+       { "AIF1 AD0L", NULL, "MODCLK AFI1" },
+       { "AIF1 AD0R", NULL, "MODCLK AFI1" },
+       { "AIF1 DA0L", NULL, "MODCLK AFI1" },
+       { "AIF1 DA0R", NULL, "MODCLK AFI1" },
 
        { "RST DAC", NULL, "SYSCLK" },
        { "MODCLK DAC", NULL, "RST DAC" },
        { "DAC", NULL, "MODCLK DAC" },
+       { "DACL", NULL, "DAC" },
+       { "DACR", NULL, "DAC" },
 
        { "RST ADC", NULL, "SYSCLK" },
        { "MODCLK ADC", NULL, "RST ADC" },
        { "ADC", NULL, "MODCLK ADC" },
+       { "ADCL", NULL, "ADC" },
+       { "ADCR", NULL, "ADC" },
 
        /* DAC Routes */
-       { "AIF1 Slot 0 Right", NULL, "DAC" },
-       { "AIF1 Slot 0 Left", NULL, "DAC" },
+       { "DACL", NULL, "Left Digital DAC Mixer" },
+       { "DACR", NULL, "Right Digital DAC Mixer" },
 
        /* DAC Mixer Routes */
-       { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
-         "AIF1 Slot 0 Left"},
-       { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch",
-         "AIF1 Slot 0 Right"},
+       { "Left Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "AIF1 DA0L" },
+       { "Right Digital DAC Mixer", "AIF1 Slot 0 Digital DAC Playback Switch", "AIF1 DA0R" },
 
        /* ADC Routes */
-       { "AIF1 Slot 0 Right ADC", NULL, "ADC" },
-       { "AIF1 Slot 0 Left ADC", NULL, "ADC" },
+       { "AIF1 AD0L", NULL, "Left Digital ADC Mixer" },
+       { "AIF1 AD0R", NULL, "Right Digital ADC Mixer" },
 
        /* ADC Mixer Routes */
-       { "Left Digital ADC Mixer", "AIF1 Data Digital ADC Capture Switch",
-         "AIF1 Slot 0 Left ADC" },
-       { "Right Digital ADC Mixer", "AIF1 Data Digital ADC Capture Switch",
-         "AIF1 Slot 0 Right ADC" },
+       { "Left Digital ADC Mixer", "AIF1 Data Digital ADC Capture Switch", "ADCL" },
+       { "Right Digital ADC Mixer", "AIF1 Data Digital ADC Capture Switch", "ADCR" },
+};
+
+static const struct snd_soc_dapm_widget sun8i_codec_legacy_widgets[] = {
+       /* Legacy ADC Inputs (connected to analog codec DAPM context) */
+       SND_SOC_DAPM_ADC("AIF1 Slot 0 Left ADC", NULL, SND_SOC_NOPM, 0, 0),
+       SND_SOC_DAPM_ADC("AIF1 Slot 0 Right ADC", NULL, SND_SOC_NOPM, 0, 0),
+
+       /* Legacy DAC Outputs (connected to analog codec DAPM context) */
+       SND_SOC_DAPM_DAC("AIF1 Slot 0 Left", NULL, SND_SOC_NOPM, 0, 0),
+       SND_SOC_DAPM_DAC("AIF1 Slot 0 Right", NULL, SND_SOC_NOPM, 0, 0),
+};
+
+static const struct snd_soc_dapm_route sun8i_codec_legacy_routes[] = {
+       /* Legacy ADC Routes */
+       { "ADCL", NULL, "AIF1 Slot 0 Left ADC" },
+       { "ADCR", NULL, "AIF1 Slot 0 Right ADC" },
+
+       /* Legacy DAC Routes */
+       { "AIF1 Slot 0 Left", NULL, "DACL" },
+       { "AIF1 Slot 0 Right", NULL, "DACR" },
 };
 
+static int sun8i_codec_component_probe(struct snd_soc_component *component)
+{
+       struct snd_soc_dapm_context *dapm = snd_soc_component_get_dapm(component);
+       struct sun8i_codec *scodec = snd_soc_component_get_drvdata(component);
+       int ret;
+
+       /* Add widgets for backward compatibility with old device trees. */
+       if (scodec->quirks->legacy_widgets) {
+               ret = snd_soc_dapm_new_controls(dapm, sun8i_codec_legacy_widgets,
+                                               ARRAY_SIZE(sun8i_codec_legacy_widgets));
+               if (ret)
+                       return ret;
+
+               ret = snd_soc_dapm_add_routes(dapm, sun8i_codec_legacy_routes,
+                                             ARRAY_SIZE(sun8i_codec_legacy_routes));
+               if (ret)
+                       return ret;
+       }
+
+       return 0;
+}
+
 static const struct snd_soc_dai_ops sun8i_codec_dai_ops = {
        .hw_params = sun8i_codec_hw_params,
        .set_fmt = sun8i_set_fmt,
@@ -566,6 +626,8 @@ static int sun8i_codec_probe(struct platform_device *pdev)
                return PTR_ERR(scodec->regmap);
        }
 
+       scodec->quirks = of_device_get_match_data(&pdev->dev);
+
        platform_set_drvdata(pdev, scodec);
 
        pm_runtime_enable(&pdev->dev);
@@ -603,8 +665,16 @@ static int sun8i_codec_remove(struct platform_device *pdev)
        return 0;
 }
 
+static const struct sun8i_codec_quirks sun8i_a33_quirks = {
+       .legacy_widgets = true,
+};
+
+static const struct sun8i_codec_quirks sun50i_a64_quirks = {
+};
+
 static const struct of_device_id sun8i_codec_of_match[] = {
-       { .compatible = "allwinner,sun8i-a33-codec" },
+       { .compatible = "allwinner,sun8i-a33-codec", .data = &sun8i_a33_quirks },
+       { .compatible = "allwinner,sun50i-a64-codec", .data = &sun50i_a64_quirks },
        {}
 };
 MODULE_DEVICE_TABLE(of, sun8i_codec_of_match);