diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-07 09:24:57 -0500 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-02-07 14:03:00 -0500 |
| commit | dc9c745437fc0d3ce7b2bd71594ea5ac48187f26 (patch) | |
| tree | a8fe60bd9c05a6eda49ac3338e3bbadc30351805 /sound/soc/codecs/wm_hubs.c | |
| parent | 6035bbcfc0849450da9fb2389cf946303b41fa08 (diff) | |
ASoC: wm_hubs: Convert most output drivers to OUT_DRV widgets
No practical impact but now we have the control type we may as well use
it for the slightly nicer sequencing.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs/wm_hubs.c')
| -rw-r--r-- | sound/soc/codecs/wm_hubs.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sound/soc/codecs/wm_hubs.c b/sound/soc/codecs/wm_hubs.c index c509911a59fc..524828ba8ceb 100644 --- a/sound/soc/codecs/wm_hubs.c +++ b/sound/soc/codecs/wm_hubs.c | |||
| @@ -654,10 +654,10 @@ SND_SOC_DAPM_MIXER("SPKR Boost", SND_SOC_NOPM, 0, 0, | |||
| 654 | right_speaker_boost, ARRAY_SIZE(right_speaker_boost)), | 654 | right_speaker_boost, ARRAY_SIZE(right_speaker_boost)), |
| 655 | 655 | ||
| 656 | SND_SOC_DAPM_SUPPLY("TSHUT", WM8993_POWER_MANAGEMENT_2, 14, 0, NULL, 0), | 656 | SND_SOC_DAPM_SUPPLY("TSHUT", WM8993_POWER_MANAGEMENT_2, 14, 0, NULL, 0), |
| 657 | SND_SOC_DAPM_PGA("SPKL Driver", WM8993_POWER_MANAGEMENT_1, 12, 0, | 657 | SND_SOC_DAPM_OUT_DRV("SPKL Driver", WM8993_POWER_MANAGEMENT_1, 12, 0, |
| 658 | NULL, 0), | 658 | NULL, 0), |
| 659 | SND_SOC_DAPM_PGA("SPKR Driver", WM8993_POWER_MANAGEMENT_1, 13, 0, | 659 | SND_SOC_DAPM_OUT_DRV("SPKR Driver", WM8993_POWER_MANAGEMENT_1, 13, 0, |
| 660 | NULL, 0), | 660 | NULL, 0), |
| 661 | 661 | ||
| 662 | SND_SOC_DAPM_MIXER("LINEOUT1 Mixer", SND_SOC_NOPM, 0, 0, | 662 | SND_SOC_DAPM_MIXER("LINEOUT1 Mixer", SND_SOC_NOPM, 0, 0, |
| 663 | line1_mix, ARRAY_SIZE(line1_mix)), | 663 | line1_mix, ARRAY_SIZE(line1_mix)), |
| @@ -673,14 +673,14 @@ SND_SOC_DAPM_MIXER("LINEOUT2N Mixer", SND_SOC_NOPM, 0, 0, | |||
| 673 | SND_SOC_DAPM_MIXER("LINEOUT2P Mixer", SND_SOC_NOPM, 0, 0, | 673 | SND_SOC_DAPM_MIXER("LINEOUT2P Mixer", SND_SOC_NOPM, 0, 0, |
| 674 | line2p_mix, ARRAY_SIZE(line2p_mix)), | 674 | line2p_mix, ARRAY_SIZE(line2p_mix)), |
| 675 | 675 | ||
| 676 | SND_SOC_DAPM_PGA("LINEOUT1N Driver", WM8993_POWER_MANAGEMENT_3, 13, 0, | 676 | SND_SOC_DAPM_OUT_DRV("LINEOUT1N Driver", WM8993_POWER_MANAGEMENT_3, 13, 0, |
| 677 | NULL, 0), | 677 | NULL, 0), |
| 678 | SND_SOC_DAPM_PGA("LINEOUT1P Driver", WM8993_POWER_MANAGEMENT_3, 12, 0, | 678 | SND_SOC_DAPM_OUT_DRV("LINEOUT1P Driver", WM8993_POWER_MANAGEMENT_3, 12, 0, |
| 679 | NULL, 0), | 679 | NULL, 0), |
| 680 | SND_SOC_DAPM_PGA("LINEOUT2N Driver", WM8993_POWER_MANAGEMENT_3, 11, 0, | 680 | SND_SOC_DAPM_OUT_DRV("LINEOUT2N Driver", WM8993_POWER_MANAGEMENT_3, 11, 0, |
| 681 | NULL, 0), | 681 | NULL, 0), |
| 682 | SND_SOC_DAPM_PGA("LINEOUT2P Driver", WM8993_POWER_MANAGEMENT_3, 10, 0, | 682 | SND_SOC_DAPM_OUT_DRV("LINEOUT2P Driver", WM8993_POWER_MANAGEMENT_3, 10, 0, |
| 683 | NULL, 0), | 683 | NULL, 0), |
| 684 | 684 | ||
| 685 | SND_SOC_DAPM_OUTPUT("SPKOUTLP"), | 685 | SND_SOC_DAPM_OUTPUT("SPKOUTLP"), |
| 686 | SND_SOC_DAPM_OUTPUT("SPKOUTLN"), | 686 | SND_SOC_DAPM_OUTPUT("SPKOUTLN"), |