Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 7f3dd4a8e31cdaed5f80f24b798cedcab644830b

Authored by Paul Handrigan
Committed by Mark Brown
1 parent 41df0829ce

ASoC: cs42l73: Change VSPIN/VSPOUT to VSPINOUT 

Since VSP only has one power bit, only provide one DAPM widget.

Signed-off-by: Paul Handrigan <Paul.Handrigan@cirrus.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

Showing 1 changed file with 13 additions and 19 deletions Side-by-side Diff

sound/soc/codecs/cs42l73.c
Diff comments   View file @ 7f3dd4a
... ... @@ -658,10 +658,8 @@
658 658 CS42L73_PWRCTL2, 3, 1),
659 659 SND_SOC_DAPM_AIF_OUT("ASPOUTR", NULL, 0,
660 660 CS42L73_PWRCTL2, 3, 1),
661   - SND_SOC_DAPM_AIF_OUT("VSPOUTL", NULL, 0,
  661 + SND_SOC_DAPM_AIF_OUT("VSPINOUT", NULL, 0,
662 662 CS42L73_PWRCTL2, 4, 1),
663   - SND_SOC_DAPM_AIF_OUT("VSPOUTR", NULL, 0,
664   - CS42L73_PWRCTL2, 4, 1),
665 663  
666 664 SND_SOC_DAPM_PGA("PGA Left", SND_SOC_NOPM, 0, 0, NULL, 0),
667 665 SND_SOC_DAPM_PGA("PGA Right", SND_SOC_NOPM, 0, 0, NULL, 0),
... ... @@ -686,8 +684,7 @@
686 684 SND_SOC_DAPM_MIXER("ASPR Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
687 685 SND_SOC_DAPM_MIXER("XSPL Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
688 686 SND_SOC_DAPM_MIXER("XSPR Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
689   - SND_SOC_DAPM_MIXER("VSPL Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
690   - SND_SOC_DAPM_MIXER("VSPR Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
  687 + SND_SOC_DAPM_MIXER("VSP Output Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
691 688  
692 689 SND_SOC_DAPM_AIF_IN("XSPINL", NULL, 0,
693 690 CS42L73_PWRCTL2, 0, 1),
... ... @@ -703,7 +700,7 @@
703 700 SND_SOC_DAPM_AIF_IN("ASPINM", NULL, 0,
704 701 CS42L73_PWRCTL2, 2, 1),
705 702  
706   - SND_SOC_DAPM_AIF_IN("VSPIN", NULL, 0,
  703 + SND_SOC_DAPM_AIF_IN("VSPINOUT", NULL, 0,
707 704 CS42L73_PWRCTL2, 4, 1),
708 705  
709 706 SND_SOC_DAPM_MIXER("HL Left Mixer", SND_SOC_NOPM, 0, 0, NULL, 0),
... ... @@ -763,7 +760,7 @@
763 760  
764 761 {"ESL DAC", "ESL-ASP Mono Volume", "ESL Mixer"},
765 762 {"ESL DAC", "ESL-XSP Mono Volume", "ESL Mixer"},
766   - {"ESL DAC", "ESL-VSP Mono Volume", "VSPIN"},
  763 + {"ESL DAC", "ESL-VSP Mono Volume", "VSPINOUT"},
767 764 /* Loopback */
768 765 {"ESL DAC", "ESL-IP Mono Volume", "Input Left Capture"},
769 766 {"ESL DAC", "ESL-IP Mono Volume", "Input Right Capture"},
... ... @@ -785,7 +782,7 @@
785 782  
786 783 {"SPK DAC", "SPK-ASP Mono Volume", "SPK Mixer"},
787 784 {"SPK DAC", "SPK-XSP Mono Volume", "SPK Mixer"},
788   - {"SPK DAC", "SPK-VSP Mono Volume", "VSPIN"},
  785 + {"SPK DAC", "SPK-VSP Mono Volume", "VSPINOUT"},
789 786 /* Loopback */
790 787 {"SPK DAC", "SPK-IP Mono Volume", "Input Left Capture"},
791 788 {"SPK DAC", "SPK-IP Mono Volume", "Input Right Capture"},
... ... @@ -828,8 +825,8 @@
828 825 {"HL Right Mixer", NULL, "ASPINR"},
829 826 {"HL Left Mixer", NULL, "XSPINL"},
830 827 {"HL Right Mixer", NULL, "XSPINR"},
831   - {"HL Left Mixer", NULL, "VSPIN"},
832   - {"HL Right Mixer", NULL, "VSPIN"},
  828 + {"HL Left Mixer", NULL, "VSPINOUT"},
  829 + {"HL Right Mixer", NULL, "VSPINOUT"},
833 830  
834 831 {"ASPINL", NULL, "ASP Playback"},
835 832 {"ASPINM", NULL, "ASP Playback"},
... ... @@ -837,7 +834,7 @@
837 834 {"XSPINL", NULL, "XSP Playback"},
838 835 {"XSPINM", NULL, "XSP Playback"},
839 836 {"XSPINR", NULL, "XSP Playback"},
840   - {"VSPIN", NULL, "VSP Playback"},
  837 + {"VSPINOUT", NULL, "VSP Playback"},
841 838  
842 839 /* Capture Paths */
843 840 {"MIC1", NULL, "MIC1 Bias"},
844 841  
845 842  
846 843  
... ... @@ -879,21 +876,18 @@
879 876 {"XSPOUTR", NULL, "XSPR Output Mixer"},
880 877  
881 878 /* Voice Capture */
882   - {"VSPL Output Mixer", NULL, "Input Left Capture"},
883   - {"VSPR Output Mixer", NULL, "Input Left Capture"},
  879 + {"VSP Output Mixer", NULL, "Input Left Capture"},
  880 + {"VSP Output Mixer", NULL, "Input Right Capture"},
884 881  
885   - {"VSPOUTL", "VSP-IP Volume", "VSPL Output Mixer"},
886   - {"VSPOUTR", "VSP-IP Volume", "VSPR Output Mixer"},
  882 + {"VSPINOUT", "VSP-IP Volume", "VSP Output Mixer"},
887 883  
888   - {"VSPOUTL", NULL, "VSPL Output Mixer"},
889   - {"VSPOUTR", NULL, "VSPR Output Mixer"},
  884 + {"VSPINOUT", NULL, "VSP Output Mixer"},
890 885  
891 886 {"ASP Capture", NULL, "ASPOUTL"},
892 887 {"ASP Capture", NULL, "ASPOUTR"},
893 888 {"XSP Capture", NULL, "XSPOUTL"},
894 889 {"XSP Capture", NULL, "XSPOUTR"},
895   - {"VSP Capture", NULL, "VSPOUTL"},
896   - {"VSP Capture", NULL, "VSPOUTR"},
  890 + {"VSP Capture", NULL, "VSPINOUT"},
897 891 };
898 892  
899 893 struct cs42l73_mclk_div {