From: Peter Ujfalusi <peter.ujfalusi@nokia.com>
To: alsa-devel@alsa-project.org
Cc: sakoman@gmail.com, Peter Ujfalusi <peter.ujfalusi@nokia.com>
Subject: [PATCH 9/9] ASoC: TWL4030: Do not alter the Headset output volume on power-up/down
Date: Tue, 9 Dec 2008 08:45:51 +0200 [thread overview]
Message-ID: <1228805151-29385-10-git-send-email-peter.ujfalusi@nokia.com> (raw)
In-Reply-To: <1228805151-29385-9-git-send-email-peter.ujfalusi@nokia.com>
There is a separate gain control for the Headset output already.
Do not reset the gain to 0 dB at power up.
In power-down, there is no need to set the Headset output gain
to power-down mode, since if the CODECPDZ is in powered off this
setting has no effect.
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@nokia.com>
---
sound/soc/codecs/twl4030.c | 12 ++----------
1 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c
index 9ddf521..51a47de 100644
--- a/sound/soc/codecs/twl4030.c
+++ b/sound/soc/codecs/twl4030.c
@@ -887,7 +887,7 @@ static int twl4030_add_widgets(struct snd_soc_codec *codec)
static void twl4030_power_up(struct snd_soc_codec *codec)
{
- u8 anamicl, regmisc1, byte, popn, hsgain;
+ u8 anamicl, regmisc1, byte, popn;
int i = 0;
/* set CODECPDZ to turn on codec */
@@ -925,10 +925,6 @@ static void twl4030_power_up(struct snd_soc_codec *codec)
popn |= TWL4030_VMID_EN;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, popn);
- /* enable output stage and gain setting */
- hsgain = TWL4030_HSR_GAIN_0DB | TWL4030_HSL_GAIN_0DB;
- twl4030_write(codec, TWL4030_REG_HS_GAIN_SET, hsgain);
-
/* enable anti-pop ramp */
popn |= TWL4030_RAMP_EN;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, popn);
@@ -936,17 +932,13 @@ static void twl4030_power_up(struct snd_soc_codec *codec)
static void twl4030_power_down(struct snd_soc_codec *codec)
{
- u8 popn, hsgain;
+ u8 popn;
/* disable anti-pop ramp */
popn = twl4030_read_reg_cache(codec, TWL4030_REG_HS_POPN_SET);
popn &= ~TWL4030_RAMP_EN;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, popn);
- /* disable output stage and gain setting */
- hsgain = TWL4030_HSR_GAIN_PWR_DOWN | TWL4030_HSL_GAIN_PWR_DOWN;
- twl4030_write(codec, TWL4030_REG_HS_GAIN_SET, hsgain);
-
/* disable bias out */
popn &= ~TWL4030_VMID_EN;
twl4030_write(codec, TWL4030_REG_HS_POPN_SET, popn);
--
1.6.0.3
next prev parent reply other threads:[~2008-12-09 6:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-12-09 6:45 [PATCH 0/9] ASoC: TWL4030: DAPM implementation for outputs (playback) - try2 Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 1/9] ASoC: TWL4030: Correct DAPM_DAC with power control Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 2/9] ASoC: TWL4030: Add Analog PGA control switch to DAPM Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 3/9] ASoC: TWL4030: Add DAPM event handler for output MUX selection Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 4/9] ASoC: TWL4030: DAPM mapping of the Earpiece output Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 5/9] ASoC: TWL4030: DAPM mapping of the PreDriv outputs Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 6/9] ASoC: TWL4030: DAPM mapping of the Headset outputs Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 7/9] ASoC: TWL4030: DAPM mapping of the Carkit outputs Peter Ujfalusi
2008-12-09 6:45 ` [PATCH 8/9] ASoC: TWL4030: DAPM mapping of the Handsfree outputs Peter Ujfalusi
2008-12-09 6:45 ` Peter Ujfalusi [this message]
2008-12-09 10:03 ` [PATCH 4/9] ASoC: TWL4030: DAPM mapping of the Earpiece output Mark Brown
2008-12-09 10:08 ` Peter Ujfalusi
2008-12-09 10:04 ` [PATCH 2/9] ASoC: TWL4030: Add Analog PGA control switch to DAPM Mark Brown
2008-12-09 10:03 ` [PATCH 1/9] ASoC: TWL4030: Correct DAPM_DAC with power control Mark Brown
-- strict thread matches above, loose matches on Subject: below --
2008-12-09 10:35 [PATCH 0/9] ASoC: TWL4030: DAPM implementation for outputs (playback) - try3 Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 1/9] ASoC: TWL4030: Correct DAPM_DAC with power control Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 2/9] ASoC: TWL4030: Add Analog PGA control switch to DAPM Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 3/9] ASoC: TWL4030: Add DAPM event handler for output MUX selection Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 4/9] ASoC: TWL4030: DAPM mapping of the Earpiece output Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 5/9] ASoC: TWL4030: DAPM mapping of the PreDriv outputs Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 6/9] ASoC: TWL4030: DAPM mapping of the Headset outputs Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 7/9] ASoC: TWL4030: DAPM mapping of the Carkit outputs Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 8/9] ASoC: TWL4030: DAPM mapping of the Handsfree outputs Peter Ujfalusi
2008-12-09 10:35 ` [PATCH 9/9] ASoC: TWL4030: Do not alter the Headset output volume on power-up/down Peter Ujfalusi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1228805151-29385-10-git-send-email-peter.ujfalusi@nokia.com \
--to=peter.ujfalusi@nokia.com \
--cc=alsa-devel@alsa-project.org \
--cc=sakoman@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox