diff options
author | Brian Austin <brian.austin@cirrus.com> | 2012-05-09 13:33:22 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-05-09 13:47:32 -0400 |
commit | 33d0188ce69cea1841ceabe8e6c0cd07e2d6a894 (patch) | |
tree | 890b8afe9b16842ecf784cce9f54d74043e4f271 /sound/soc/codecs/cs42l73.c | |
parent | 222ec4eb2c19aaa18bd3515c845c4aeeb1b86d03 (diff) |
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>
Diffstat (limited to 'sound/soc/codecs/cs42l73.c')
-rw-r--r-- | sound/soc/codecs/cs42l73.c | 41 |
1 files changed, 28 insertions, 13 deletions
diff --git a/sound/soc/codecs/cs42l73.c b/sound/soc/codecs/cs42l73.c index 0d7debe5af0e..48a76fed2377 100644 --- 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[] = { | |||
596 | SND_SOC_DAPM_INPUT("MIC2"), | 596 | SND_SOC_DAPM_INPUT("MIC2"), |
597 | SND_SOC_DAPM_SUPPLY("MIC2 Bias", CS42L73_PWRCTL2, 7, 1, NULL, 0), | 597 | SND_SOC_DAPM_SUPPLY("MIC2 Bias", CS42L73_PWRCTL2, 7, 1, NULL, 0), |
598 | 598 | ||
599 | SND_SOC_DAPM_AIF_OUT("XSPOUTL", "XSP Capture", 0, | 599 | SND_SOC_DAPM_AIF_OUT("XSPOUTL", NULL, 0, |
600 | CS42L73_PWRCTL2, 1, 1), | 600 | CS42L73_PWRCTL2, 1, 1), |
601 | SND_SOC_DAPM_AIF_OUT("XSPOUTR", "XSP Capture", 0, | 601 | SND_SOC_DAPM_AIF_OUT("XSPOUTR", NULL, 0, |
602 | CS42L73_PWRCTL2, 1, 1), | 602 | CS42L73_PWRCTL2, 1, 1), |
603 | SND_SOC_DAPM_AIF_OUT("ASPOUTL", "ASP Capture", 0, | 603 | SND_SOC_DAPM_AIF_OUT("ASPOUTL", NULL, 0, |
604 | CS42L73_PWRCTL2, 3, 1), | 604 | CS42L73_PWRCTL2, 3, 1), |
605 | SND_SOC_DAPM_AIF_OUT("ASPOUTR", "ASP Capture", 0, | 605 | SND_SOC_DAPM_AIF_OUT("ASPOUTR", NULL, 0, |
606 | CS42L73_PWRCTL2, 3, 1), | 606 | CS42L73_PWRCTL2, 3, 1), |
607 | SND_SOC_DAPM_AIF_OUT("VSPOUTL", "VSP Capture", 0, | 607 | SND_SOC_DAPM_AIF_OUT("VSPOUTL", NULL, 0, |
608 | CS42L73_PWRCTL2, 4, 1), | 608 | CS42L73_PWRCTL2, 4, 1), |
609 | SND_SOC_DAPM_AIF_OUT("VSPOUTR", "VSP Capture", 0, | 609 | SND_SOC_DAPM_AIF_OUT("VSPOUTR", NULL, 0, |
610 | CS42L73_PWRCTL2, 4, 1), | 610 | CS42L73_PWRCTL2, 4, 1), |
611 | 611 | ||
612 | SND_SOC_DAPM_PGA("PGA Left", SND_SOC_NOPM, 0, 0, NULL, 0), | 612 | 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[] = { | |||
635 | SND_SOC_DAPM_MIXER("VSPL Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), | 635 | SND_SOC_DAPM_MIXER("VSPL Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), |
636 | SND_SOC_DAPM_MIXER("VSPR Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), | 636 | SND_SOC_DAPM_MIXER("VSPR Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), |
637 | 637 | ||
638 | SND_SOC_DAPM_AIF_IN("XSPINL", "XSP Playback", 0, | 638 | SND_SOC_DAPM_AIF_IN("XSPINL", NULL, 0, |
639 | CS42L73_PWRCTL2, 0, 1), | 639 | CS42L73_PWRCTL2, 0, 1), |
640 | SND_SOC_DAPM_AIF_IN("XSPINR", "XSP Playback", 0, | 640 | SND_SOC_DAPM_AIF_IN("XSPINR", NULL, 0, |
641 | CS42L73_PWRCTL2, 0, 1), | 641 | CS42L73_PWRCTL2, 0, 1), |
642 | SND_SOC_DAPM_AIF_IN("XSPINM", "XSP Playback", 0, | 642 | SND_SOC_DAPM_AIF_IN("XSPINM", NULL, 0, |
643 | CS42L73_PWRCTL2, 0, 1), | 643 | CS42L73_PWRCTL2, 0, 1), |
644 | 644 | ||
645 | SND_SOC_DAPM_AIF_IN("ASPINL", "ASP Playback", 0, | 645 | SND_SOC_DAPM_AIF_IN("ASPINL", NULL, 0, |
646 | CS42L73_PWRCTL2, 2, 1), | 646 | CS42L73_PWRCTL2, 2, 1), |
647 | SND_SOC_DAPM_AIF_IN("ASPINR", "ASP Playback", 0, | 647 | SND_SOC_DAPM_AIF_IN("ASPINR", NULL, 0, |
648 | CS42L73_PWRCTL2, 2, 1), | 648 | CS42L73_PWRCTL2, 2, 1), |
649 | SND_SOC_DAPM_AIF_IN("ASPINM", "ASP Playback", 0, | 649 | SND_SOC_DAPM_AIF_IN("ASPINM", NULL, 0, |
650 | CS42L73_PWRCTL2, 2, 1), | 650 | CS42L73_PWRCTL2, 2, 1), |
651 | 651 | ||
652 | SND_SOC_DAPM_AIF_IN("VSPIN", "VSP Playback", 0, | 652 | SND_SOC_DAPM_AIF_IN("VSPIN", NULL, 0, |
653 | CS42L73_PWRCTL2, 4, 1), | 653 | CS42L73_PWRCTL2, 4, 1), |
654 | 654 | ||
655 | SND_SOC_DAPM_MIXER("HL Left Mixer", SND_SOC_NOPM, 0, 0, NULL, 0), | 655 | 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[] = { | |||
773 | {"HL Left Mixer", NULL, "VSPIN"}, | 773 | {"HL Left Mixer", NULL, "VSPIN"}, |
774 | {"HL Right Mixer", NULL, "VSPIN"}, | 774 | {"HL Right Mixer", NULL, "VSPIN"}, |
775 | 775 | ||
776 | {"ASPINL", NULL, "ASP Playback"}, | ||
777 | {"ASPINM", NULL, "ASP Playback"}, | ||
778 | {"ASPINR", NULL, "ASP Playback"}, | ||
779 | {"XSPINL", NULL, "XSP Playback"}, | ||
780 | {"XSPINM", NULL, "XSP Playback"}, | ||
781 | {"XSPINR", NULL, "XSP Playback"}, | ||
782 | {"VSPIN", NULL, "VSP Playback"}, | ||
783 | |||
776 | /* Capture Paths */ | 784 | /* Capture Paths */ |
777 | {"MIC1", NULL, "MIC1 Bias"}, | 785 | {"MIC1", NULL, "MIC1 Bias"}, |
778 | {"PGA Left Mux", "Mic 1", "MIC1"}, | 786 | {"PGA Left Mux", "Mic 1", "MIC1"}, |
@@ -819,6 +827,13 @@ static const struct snd_soc_dapm_route cs42l73_audio_map[] = { | |||
819 | 827 | ||
820 | {"VSPOUTL", NULL, "VSPL Output Mixer"}, | 828 | {"VSPOUTL", NULL, "VSPL Output Mixer"}, |
821 | {"VSPOUTR", NULL, "VSPR Output Mixer"}, | 829 | {"VSPOUTR", NULL, "VSPR Output Mixer"}, |
830 | |||
831 | {"ASP Capture", NULL, "ASPOUTL"}, | ||
832 | {"ASP Capture", NULL, "ASPOUTR"}, | ||
833 | {"XSP Capture", NULL, "XSPOUTL"}, | ||
834 | {"XSP Capture", NULL, "XSPOUTR"}, | ||
835 | {"VSP Capture", NULL, "VSPOUTL"}, | ||
836 | {"VSP Capture", NULL, "VSPOUTR"}, | ||
822 | }; | 837 | }; |
823 | 838 | ||
824 | struct cs42l73_mclk_div { | 839 | struct cs42l73_mclk_div { |