summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorLionel Xu <Lionel.Xu@freescale.com>2010-05-20 16:04:00 +0800
committerFrank Li <Frank.Li@freescale.com>2010-05-21 11:38:22 +0800
commit1534c4228f2b94930871ff7bb86b50f7239e958e (patch)
tree31792d216753450bbd9669ff42683dc88ac34745 /sound
parentd27b846f797d2cab3d27f8cf64ed9648c692293d (diff)
ENGR00122307 MX23 ALSA: Speaker is muted after playback
Speak should not be muted after playback Signed-off-by: Lionel Xu <r63889@freescale.com>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/mxs/mxs-adc.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/sound/soc/mxs/mxs-adc.c b/sound/soc/mxs/mxs-adc.c
index 302c4e1f60c1..af2cbbdc0c58 100644
--- a/sound/soc/mxs/mxs-adc.c
+++ b/sound/soc/mxs/mxs-adc.c
@@ -209,8 +209,6 @@ static int mxs_adc_trigger(struct snd_pcm_substream *substream,
REGS_AUDIOOUT_BASE + HW_AUDIOOUT_HPVOL);
udelay(100);
}
- __raw_writel(BM_AUDIOOUT_SPEAKERCTRL_MUTE,
- REGS_AUDIOIN_BASE + HW_AUDIOOUT_SPEAKERCTRL_CLR);
}
else
__raw_writel(BM_AUDIOIN_CTRL_RUN,
@@ -223,8 +221,6 @@ static int mxs_adc_trigger(struct snd_pcm_substream *substream,
if (playback) {
__raw_writel(BM_AUDIOOUT_ANACTRL_HP_HOLD_GND,
REGS_AUDIOOUT_BASE + HW_AUDIOOUT_ANACTRL_SET);
- __raw_writel(BM_AUDIOOUT_SPEAKERCTRL_MUTE,
- REGS_AUDIOOUT_BASE + HW_AUDIOOUT_SPEAKERCTRL_SET);
/* disable the fifo error interrupt */
__raw_writel(BM_AUDIOOUT_CTRL_FIFO_ERROR_IRQ_EN,
REGS_AUDIOOUT_BASE + HW_AUDIOOUT_CTRL_CLR);