alsa-devel.alsa-project.org archive mirror
 help / color / mirror / Atom feed
From: yang.a.fang@intel.com
To: broonie@kernel.org, lgirdwood@gmail.com
Cc: alsa-devel@alsa-project.org, srinivas.sripathi@intel.com,
	vinod.koul@intel.com, praveen.k.jain@intel.com,
	denny.iriawan@intel.com, "Fang, Yang A" <yang.a.fang@intel.com>,
	sathyanarayana.nujella@intel.com, kevin.strasser@linux.intel.com,
	dgreid@chromium.org
Subject: [PATCH v2 1/3] ASoC: max98090: read micbias from device property
Date: Thu, 28 May 2015 11:00:46 -0700	[thread overview]
Message-ID: <1432836048-102175-1-git-send-email-yang.a.fang@intel.com> (raw)
In-Reply-To: <1432684686-14460-1-git-send-email-yang.a.fang@intel.com>

From: "Fang, Yang A" <yang.a.fang@intel.com>

This patch reads max98090 micbias from acpi or dt

Signed-off-by: Fang, Yang A <yang.a.fang@intel.com>
---
 .../devicetree/bindings/sound/max98090.txt         |    2 ++
 sound/soc/codecs/max98090.c                        |    8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/sound/max98090.txt b/Documentation/devicetree/bindings/sound/max98090.txt
index aa802a2..eecb710 100644
--- a/Documentation/devicetree/bindings/sound/max98090.txt
+++ b/Documentation/devicetree/bindings/sound/max98090.txt
@@ -18,6 +18,8 @@ Optional properties:
 
 - maxim,dmic-freq: Frequency at which to clock DMIC
 
+- maxim,micbias: Micbias voltage applies to the analog mic
+
 Pins on the device (for linking into audio routes):
 
   * MIC1
diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index c230626..4b61db7 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2419,6 +2419,8 @@ static int max98090_probe(struct snd_soc_codec *codec)
 	struct max98090_cdata *cdata;
 	enum max98090_type devtype;
 	int ret = 0;
+	int err;
+	unsigned int micbias;
 
 	dev_dbg(codec->dev, "max98090_probe\n");
 
@@ -2503,8 +2505,12 @@ static int max98090_probe(struct snd_soc_codec *codec)
 	snd_soc_write(codec, M98090_REG_BIAS_CONTROL,
 		M98090_VCM_MODE_MASK);
 
+	err = device_property_read_u32(codec->dev, "maxim,micbias", &micbias);
+	if (err || micbias < M98090_MBVSEL_2V2  || micbias > M98090_MBVSEL_2V8)
+		micbias = M98090_MBVSEL_2V8;
+
 	snd_soc_update_bits(codec, M98090_REG_MIC_BIAS_VOLTAGE,
-		M98090_MBVSEL_MASK, M98090_MBVSEL_2V8);
+		M98090_MBVSEL_MASK, micbias);
 
 	max98090_add_widgets(codec);
 
-- 
1.7.9.5

  parent reply	other threads:[~2015-05-28 18:01 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-26 23:58 [PATCH 1/3] ASoC: max98090: read micbias from device property yang.a.fang
2015-05-26 23:58 ` [PATCH 2/3] ASoC: ts3a227e: use device property api yang.a.fang
2015-05-28  9:29   ` Mark Brown
2015-05-26 23:58 ` [PATCH 3/3] ASoC: Intel: fixed TI button detection yang.a.fang
2015-05-27  4:39 ` [PATCH 1/3] ASoC: max98090: read micbias from device property Dylan Reid
2015-05-27 17:26   ` Yang Fang
2015-05-28  9:28 ` Mark Brown
2015-05-28 18:00 ` yang.a.fang [this message]
2015-05-28 18:00   ` [PATCH v2 2/3] ASoC: ts3a227e: use device property api yang.a.fang
2015-05-28 18:00   ` [PATCH v2 3/3] ASoC: Intel: fixed TI button detection yang.a.fang
2015-05-29  9:58   ` [PATCH v2 1/3] ASoC: max98090: read micbias from device property Mark Brown
2015-05-29 17:37     ` Fang, Yang A
2015-05-29 18:56   ` [PATCH v3 " yang.a.fang
2015-05-29 18:56     ` [PATCH v3 2/3] ASoC: ts3a227e: use device property api yang.a.fang
2015-06-02 17:17       ` Mark Brown
2015-05-29 18:56     ` [PATCH v3 3/3] ASoC: Intel: fixed TI button detection yang.a.fang
2015-06-03 18:15       ` Mark Brown
2015-06-03 20:54         ` Fang, Yang A
2015-06-03 22:07       ` [PATCH v4] " yang.a.fang
2015-06-15  9:51         ` Mark Brown
2015-06-02 17:11     ` [PATCH v3 1/3] ASoC: max98090: read micbias from device property 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=1432836048-102175-1-git-send-email-yang.a.fang@intel.com \
    --to=yang.a.fang@intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=denny.iriawan@intel.com \
    --cc=dgreid@chromium.org \
    --cc=kevin.strasser@linux.intel.com \
    --cc=lgirdwood@gmail.com \
    --cc=praveen.k.jain@intel.com \
    --cc=sathyanarayana.nujella@intel.com \
    --cc=srinivas.sripathi@intel.com \
    --cc=vinod.koul@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;
as well as URLs for NNTP newsgroup(s).