aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPeter Ujfalusi <peter.ujfalusi@Nokia.com>2010-07-26 02:59:15 -0400
committerLiam Girdwood <lrg@slimlogic.co.uk>2010-07-27 06:43:40 -0400
commitb93cc9f19bade9e9ddd41958352168dc0d266f48 (patch)
treeaaf493f865159ea6013e243bca54473ac2bad8d2 /sound
parenta7e7cd5bd7d1e0134032b8db5e64ceb9dac8b3ca (diff)
ASoC: TWL4030: Capture route DAPM event fix
There is no need to handle POST_PMU, POST_PMD event with the Capture Route widget. It is enough to handle POST_REG event, since that will come when the user changes the routing, and we will switch the needed bits in the registers. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com> Signed-off-by: Liam Girdwood <lrg@slimlogic.co.uk>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/codecs/twl4030.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index bd557c2bcb8c..d401c597d38f 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -1432,11 +1432,9 @@ static const struct snd_soc_dapm_widget twl4030_dapm_widgets[] = {
1432 TX2 Left/Right: either analog Left/Right or Digimic1 */ 1432 TX2 Left/Right: either analog Left/Right or Digimic1 */
1433 SND_SOC_DAPM_MUX_E("TX1 Capture Route", SND_SOC_NOPM, 0, 0, 1433 SND_SOC_DAPM_MUX_E("TX1 Capture Route", SND_SOC_NOPM, 0, 0,
1434 &twl4030_dapm_micpathtx1_control, micpath_event, 1434 &twl4030_dapm_micpathtx1_control, micpath_event,
1435 SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD|
1436 SND_SOC_DAPM_POST_REG), 1435 SND_SOC_DAPM_POST_REG),
1437 SND_SOC_DAPM_MUX_E("TX2 Capture Route", SND_SOC_NOPM, 0, 0, 1436 SND_SOC_DAPM_MUX_E("TX2 Capture Route", SND_SOC_NOPM, 0, 0,
1438 &twl4030_dapm_micpathtx2_control, micpath_event, 1437 &twl4030_dapm_micpathtx2_control, micpath_event,
1439 SND_SOC_DAPM_POST_PMU|SND_SOC_DAPM_POST_PMD|
1440 SND_SOC_DAPM_POST_REG), 1438 SND_SOC_DAPM_POST_REG),
1441 1439
1442 /* Analog input mixers for the capture amplifiers */ 1440 /* Analog input mixers for the capture amplifiers */