ASoC: cs42l73: Use DAPM routes to hook AIF widgets to DAI's

Signed-off-by: Brian Austin <brian.austin@cirrus.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c
index 0d7debe5af0eb540b0124135d4acd73e3031daf8..48a76fed2377c3ef051893df3ffbab76f5b1e2ad 100644 (file)
--- a/sound/soc/codecs/cs42l73.c
+++ b/sound/soc/codecs/cs42l73.c
@@ -596,17 +596,17 @@ static const struct snd_soc_dapm_widget cs42l73_dapm_widgets[] = {
        SND_SOC_DAPM_INPUT("MIC2"),
        SND_SOC_DAPM_SUPPLY("MIC2 Bias", CS42L73_PWRCTL2, 7, 1, NULL, 0),
 
-       SND_SOC_DAPM_AIF_OUT("XSPOUTL", "XSP Capture",  0,
+       SND_SOC_DAPM_AIF_OUT("XSPOUTL", NULL,  0,
                        CS42L73_PWRCTL2, 1, 1),
-       SND_SOC_DAPM_AIF_OUT("XSPOUTR", "XSP Capture",  0,
+       SND_SOC_DAPM_AIF_OUT("XSPOUTR", NULL,  0,
                        CS42L73_PWRCTL2, 1, 1),
-       SND_SOC_DAPM_AIF_OUT("ASPOUTL", "ASP Capture",  0,
+       SND_SOC_DAPM_AIF_OUT("ASPOUTL", NULL,  0,
                        CS42L73_PWRCTL2, 3, 1),
-       SND_SOC_DAPM_AIF_OUT("ASPOUTR", "ASP Capture",  0,
+       SND_SOC_DAPM_AIF_OUT("ASPOUTR", NULL,  0,
                        CS42L73_PWRCTL2, 3, 1),
-       SND_SOC_DAPM_AIF_OUT("VSPOUTL", "VSP Capture",  0,
+       SND_SOC_DAPM_AIF_OUT("VSPOUTL", NULL,  0,
                        CS42L73_PWRCTL2, 4, 1),
-       SND_SOC_DAPM_AIF_OUT("VSPOUTR", "VSP Capture",  0,
+       SND_SOC_DAPM_AIF_OUT("VSPOUTR", NULL,  0,
                        CS42L73_PWRCTL2, 4, 1),
 
        SND_SOC_DAPM_PGA("PGA Left", SND_SOC_NOPM, 0, 0, NULL, 0),
@@ -635,21 +635,21 @@ static const struct snd_soc_dapm_widget cs42l73_dapm_widgets[] = {
        SND_SOC_DAPM_MIXER("VSPL Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
        SND_SOC_DAPM_MIXER("VSPR Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
 
-       SND_SOC_DAPM_AIF_IN("XSPINL", "XSP Playback", 0,
+       SND_SOC_DAPM_AIF_IN("XSPINL", NULL, 0,
                                CS42L73_PWRCTL2, 0, 1),
-       SND_SOC_DAPM_AIF_IN("XSPINR", "XSP Playback", 0,
+       SND_SOC_DAPM_AIF_IN("XSPINR", NULL, 0,
                                CS42L73_PWRCTL2, 0, 1),
-       SND_SOC_DAPM_AIF_IN("XSPINM", "XSP Playback", 0,
+       SND_SOC_DAPM_AIF_IN("XSPINM", NULL, 0,
                                CS42L73_PWRCTL2, 0, 1),
 
-       SND_SOC_DAPM_AIF_IN("ASPINL", "ASP Playback", 0,
+       SND_SOC_DAPM_AIF_IN("ASPINL", NULL, 0,
                                CS42L73_PWRCTL2, 2, 1),
-       SND_SOC_DAPM_AIF_IN("ASPINR", "ASP Playback", 0,
+       SND_SOC_DAPM_AIF_IN("ASPINR", NULL, 0,
                                CS42L73_PWRCTL2, 2, 1),
-       SND_SOC_DAPM_AIF_IN("ASPINM", "ASP Playback", 0,
+       SND_SOC_DAPM_AIF_IN("ASPINM", NULL, 0,
                                CS42L73_PWRCTL2, 2, 1),
 
-       SND_SOC_DAPM_AIF_IN("VSPIN", "VSP Playback", 0,
+       SND_SOC_DAPM_AIF_IN("VSPIN", NULL, 0,
                                CS42L73_PWRCTL2, 4, 1),
 
        SND_SOC_DAPM_MIXER("HL Left Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
@@ -773,6 +773,14 @@ static const struct snd_soc_dapm_route cs42l73_audio_map[] = {
        {"HL Left Mixer", NULL, "VSPIN"},
        {"HL Right Mixer", NULL, "VSPIN"},
 
+       {"ASPINL", NULL, "ASP Playback"},
+       {"ASPINM", NULL, "ASP Playback"},
+       {"ASPINR", NULL, "ASP Playback"},
+       {"XSPINL", NULL, "XSP Playback"},
+       {"XSPINM", NULL, "XSP Playback"},
+       {"XSPINR", NULL, "XSP Playback"},
+       {"VSPIN", NULL, "VSP Playback"},
+
        /* Capture Paths */
        {"MIC1", NULL, "MIC1 Bias"},
        {"PGA Left Mux", "Mic 1", "MIC1"},
@@ -819,6 +827,13 @@ static const struct snd_soc_dapm_route cs42l73_audio_map[] = {
 
        {"VSPOUTL", NULL, "VSPL Output Mixer"},
        {"VSPOUTR", NULL, "VSPR Output Mixer"},
+
+       {"ASP Capture", NULL, "ASPOUTL"},
+       {"ASP Capture", NULL, "ASPOUTR"},
+       {"XSP Capture", NULL, "XSPOUTL"},
+       {"XSP Capture", NULL, "XSPOUTR"},
+       {"VSP Capture", NULL, "VSPOUTL"},
+       {"VSP Capture", NULL, "VSPOUTR"},
 };
 
 struct cs42l73_mclk_div {