Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Jarkko Nikula <jarkko.nikula@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>,
	Mark Brown <broonie@kernel.org>,
	Jarkko Nikula <jarkko.nikula@linux.intel.com>,
	Liam Girdwood <lgirdwood@gmail.com>
Subject: [PATCH 6/7] ASoC: max98090: Move microphone bias voltage setting to probe function
Date: Fri, 16 May 2014 16:55:24 +0300	[thread overview]
Message-ID: <1400248525-21900-7-git-send-email-jarkko.nikula@linux.intel.com> (raw)
In-Reply-To: <1400248525-21900-1-git-send-email-jarkko.nikula@linux.intel.com>

Microphone bias level configuration register can configure voltage between
2.2 V and 2.8 V but doesn't manage is voltage on or off. Microphone bias
on/off state is controlled by "MICBIAS" DAPM widget.

Therefore there is no need to update bias voltage conditionally depending on
jack state each time when codec goes to SND_SOC_BIAS_ON state and setting
can be moved to max98090_probe() as driver currently doesn't support other
levels than 2.8 V.

Signed-off-by: Jarkko Nikula <jarkko.nikula@linux.intel.com>
---
 sound/soc/codecs/max98090.c | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index 14d42cde9235..0c8315270e8e 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -1796,13 +1796,6 @@ static int max98090_set_bias_level(struct snd_soc_codec *codec,
 
 	switch (level) {
 	case SND_SOC_BIAS_ON:
-		if (max98090->jack_state == M98090_JACK_STATE_HEADSET) {
-			/*
-			 * Set to normal bias level.
-			 */
-			snd_soc_update_bits(codec, M98090_REG_MIC_BIAS_VOLTAGE,
-				M98090_MBVSEL_MASK, M98090_MBVSEL_2V8);
-		}
 		break;
 
 	case SND_SOC_BIAS_PREPARE:
@@ -2297,6 +2290,9 @@ static int max98090_probe(struct snd_soc_codec *codec)
 	snd_soc_write(codec, M98090_REG_BIAS_CONTROL,
 		M98090_VCM_MODE_MASK);
 
+	snd_soc_update_bits(codec, M98090_REG_MIC_BIAS_VOLTAGE,
+		M98090_MBVSEL_MASK, M98090_MBVSEL_2V8);
+
 	max98090_handle_pdata(codec);
 
 	max98090_add_widgets(codec);
-- 
2.0.0.rc0

  parent reply	other threads:[~2014-05-16 13:55 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-05-16 13:55 [PATCH 0/7] ASoC: max98090: Couple improvements and ACPI probing support Jarkko Nikula
2014-05-16 13:55 ` [PATCH 1/7] ASoC: max98090: Fix digital sidetone gain TLV Jarkko Nikula
2014-05-16 13:55 ` [PATCH 2/7] ASoC: max98090: Fix reset at resume time Jarkko Nikula
2014-05-16 13:55 ` [PATCH 3/7] ASoC: max98090: Reset codec on resume Jarkko Nikula
2014-05-16 13:55 ` [PATCH 4/7] ASoC: max98090: Mark cache as dirty prior to restoring Jarkko Nikula
2014-05-16 13:55 ` [PATCH 5/7] ASoC: max98090: Make sure we configure BCLK in one place Jarkko Nikula
2014-05-16 13:55 ` Jarkko Nikula [this message]
2014-05-16 13:55 ` [PATCH 7/7] ASoC: max98090: Add ACPI probing support Jarkko Nikula
2014-05-16 19:01 ` [PATCH 0/7] ASoC: max98090: Couple improvements and " Mark Brown

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=1400248525-21900-7-git-send-email-jarkko.nikula@linux.intel.com \
    --to=jarkko.nikula@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=lgirdwood@gmail.com \
    --cc=liam.r.girdwood@linux.intel.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