Commit 5472bbc96f1ba666328cc2479b957ed50f5e1550
1 parent
273b72c8ce
Exists in
smarc-l5.0.0_1.0.0-ga
and in
5 other branches
ASoC: wm_hubs: Don't actively manage LINEOUT_VMID_BUF
It can just be enabled all the time with no impact. Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Showing 1 changed file with 5 additions and 11 deletions Side-by-side Diff
sound/soc/codecs/wm_hubs.c
| ... | ... | @@ -643,8 +643,6 @@ |
| 643 | 643 | SND_SOC_DAPM_SUPPLY("MICBIAS2", WM8993_POWER_MANAGEMENT_1, 5, 0, NULL, 0), |
| 644 | 644 | SND_SOC_DAPM_SUPPLY("MICBIAS1", WM8993_POWER_MANAGEMENT_1, 4, 0, NULL, 0), |
| 645 | 645 | |
| 646 | -SND_SOC_DAPM_SUPPLY("LINEOUT_VMID_BUF", WM8993_ANTIPOP1, 7, 0, NULL, 0), | |
| 647 | - | |
| 648 | 646 | SND_SOC_DAPM_MIXER("IN1L PGA", WM8993_POWER_MANAGEMENT_2, 6, 0, |
| 649 | 647 | in1l_pga, ARRAY_SIZE(in1l_pga)), |
| 650 | 648 | SND_SOC_DAPM_MIXER("IN1R PGA", WM8993_POWER_MANAGEMENT_2, 4, 0, |
| 651 | 649 | |
| ... | ... | @@ -869,11 +867,9 @@ |
| 869 | 867 | }; |
| 870 | 868 | |
| 871 | 869 | static const struct snd_soc_dapm_route lineout1_se_routes[] = { |
| 872 | - { "LINEOUT1N Mixer", NULL, "LINEOUT_VMID_BUF" }, | |
| 873 | 870 | { "LINEOUT1N Mixer", "Left Output Switch", "Left Output PGA" }, |
| 874 | 871 | { "LINEOUT1N Mixer", "Right Output Switch", "Right Output PGA" }, |
| 875 | 872 | |
| 876 | - { "LINEOUT1P Mixer", NULL, "LINEOUT_VMID_BUF" }, | |
| 877 | 873 | { "LINEOUT1P Mixer", "Left Output Switch", "Left Output PGA" }, |
| 878 | 874 | |
| 879 | 875 | { "LINEOUT1N Driver", NULL, "LINEOUT1N Mixer" }, |
| 880 | 876 | |
| ... | ... | @@ -890,11 +886,9 @@ |
| 890 | 886 | }; |
| 891 | 887 | |
| 892 | 888 | static const struct snd_soc_dapm_route lineout2_se_routes[] = { |
| 893 | - { "LINEOUT2N Mixer", NULL, "LINEOUT_VMID_BUF" }, | |
| 894 | 889 | { "LINEOUT2N Mixer", "Left Output Switch", "Left Output PGA" }, |
| 895 | 890 | { "LINEOUT2N Mixer", "Right Output Switch", "Right Output PGA" }, |
| 896 | 891 | |
| 897 | - { "LINEOUT2P Mixer", NULL, "LINEOUT_VMID_BUF" }, | |
| 898 | 892 | { "LINEOUT2P Mixer", "Right Output Switch", "Right Output PGA" }, |
| 899 | 893 | |
| 900 | 894 | { "LINEOUT2N Driver", NULL, "LINEOUT2N Mixer" }, |
| ... | ... | @@ -996,6 +990,11 @@ |
| 996 | 990 | WM8993_LINEOUT2_MODE, |
| 997 | 991 | WM8993_LINEOUT2_MODE); |
| 998 | 992 | |
| 993 | + if (!lineout1_diff && !lineout2_diff) | |
| 994 | + snd_soc_update_bits(codec, WM8993_ANTIPOP1, | |
| 995 | + WM8993_LINEOUT_VMID_BUF_ENA, | |
| 996 | + WM8993_LINEOUT_VMID_BUF_ENA); | |
| 997 | + | |
| 999 | 998 | if (lineout1fb) |
| 1000 | 999 | snd_soc_update_bits(codec, WM8993_ADDITIONAL_CONTROL, |
| 1001 | 1000 | WM8993_LINEOUT1_FB, WM8993_LINEOUT1_FB); |
| ... | ... | @@ -1067,11 +1066,6 @@ |
| 1067 | 1066 | WM8993_LINEOUT2N_ENA | |
| 1068 | 1067 | WM8993_LINEOUT2P_ENA, |
| 1069 | 1068 | val); |
| 1070 | - | |
| 1071 | - if (!hubs->lineout1n_ena && !hubs->lineout1p_ena && | |
| 1072 | - !hubs->lineout2n_ena && !hubs->lineout2p_ena) | |
| 1073 | - snd_soc_update_bits(codec, WM8993_ANTIPOP1, | |
| 1074 | - WM8993_LINEOUT_VMID_BUF_ENA, 0); | |
| 1075 | 1069 | |
| 1076 | 1070 | /* Remove the input clamps */ |
| 1077 | 1071 | snd_soc_update_bits(codec, WM8993_INPUTS_CLAMP_REG, |