From: "Andrew F. Davis" <afd@ti.com> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org> Cc: <alsa-devel@alsa-project.org>, <linux-kernel@vger.kernel.org>, "Andrew F . Davis" <afd@ti.com> Subject: [PATCH v3 04/10] ASoC: tlv320aic31xx: Add MICBIAS off setting Date: Thu, 7 Dec 2017 09:38:54 -0600 [thread overview] Message-ID: <20171207153900.9831-5-afd@ti.com> (raw) In-Reply-To: <20171207153900.9831-1-afd@ti.com> Leaving microphone bias off is a valid setting and even used in the DT binding document example. Add this setting here and document the same. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Rob Herring <robh@kernel.org> --- Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | 1 + include/dt-bindings/sound/tlv320aic31xx-micbias.h | 1 + sound/soc/codecs/tlv320aic31xx.c | 1 + 3 files changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt index 5b3c33bb99e5..411cc46a2c58 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt @@ -24,6 +24,7 @@ Optional properties: - reset-gpios - GPIO specification for the active low RESET input. - ai31xx-micbias-vg - MicBias Voltage setting + 0 or MICBIAS_OFF - MICBIAS output is powered off 1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V 2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V 3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD diff --git a/include/dt-bindings/sound/tlv320aic31xx-micbias.h b/include/dt-bindings/sound/tlv320aic31xx-micbias.h index c6895a18a455..069484070fcf 100644 --- a/include/dt-bindings/sound/tlv320aic31xx-micbias.h +++ b/include/dt-bindings/sound/tlv320aic31xx-micbias.h @@ -2,6 +2,7 @@ #ifndef __DT_TLV320AIC31XX_MICBIAS_H #define __DT_TLV320AIC31XX_MICBIAS_H +#define MICBIAS_OFF 0 #define MICBIAS_2_0V 1 #define MICBIAS_2_5V 2 #define MICBIAS_AVDDV 3 diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 266141d841e7..44950c1f2532 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1320,6 +1320,7 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, fwnode_property_read_u32(aic31xx->dev->fwnode, "ai31xx-micbias-vg", &micbias_value); switch (micbias_value) { + case MICBIAS_OFF: case MICBIAS_2_0V: case MICBIAS_2_5V: case MICBIAS_AVDDV: -- 2.15.0
WARNING: multiple messages have this Message-ID (diff)
From: "Andrew F. Davis" <afd@ti.com> To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org> Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, "Andrew F . Davis" <afd@ti.com> Subject: [PATCH v3 04/10] ASoC: tlv320aic31xx: Add MICBIAS off setting Date: Thu, 7 Dec 2017 09:38:54 -0600 [thread overview] Message-ID: <20171207153900.9831-5-afd@ti.com> (raw) In-Reply-To: <20171207153900.9831-1-afd@ti.com> Leaving microphone bias off is a valid setting and even used in the DT binding document example. Add this setting here and document the same. Signed-off-by: Andrew F. Davis <afd@ti.com> Acked-by: Rob Herring <robh@kernel.org> --- Documentation/devicetree/bindings/sound/tlv320aic31xx.txt | 1 + include/dt-bindings/sound/tlv320aic31xx-micbias.h | 1 + sound/soc/codecs/tlv320aic31xx.c | 1 + 3 files changed, 3 insertions(+) diff --git a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt index 5b3c33bb99e5..411cc46a2c58 100644 --- a/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt +++ b/Documentation/devicetree/bindings/sound/tlv320aic31xx.txt @@ -24,6 +24,7 @@ Optional properties: - reset-gpios - GPIO specification for the active low RESET input. - ai31xx-micbias-vg - MicBias Voltage setting + 0 or MICBIAS_OFF - MICBIAS output is powered off 1 or MICBIAS_2_0V - MICBIAS output is powered to 2.0V 2 or MICBIAS_2_5V - MICBIAS output is powered to 2.5V 3 or MICBIAS_AVDD - MICBIAS output is connected to AVDD diff --git a/include/dt-bindings/sound/tlv320aic31xx-micbias.h b/include/dt-bindings/sound/tlv320aic31xx-micbias.h index c6895a18a455..069484070fcf 100644 --- a/include/dt-bindings/sound/tlv320aic31xx-micbias.h +++ b/include/dt-bindings/sound/tlv320aic31xx-micbias.h @@ -2,6 +2,7 @@ #ifndef __DT_TLV320AIC31XX_MICBIAS_H #define __DT_TLV320AIC31XX_MICBIAS_H +#define MICBIAS_OFF 0 #define MICBIAS_2_0V 1 #define MICBIAS_2_5V 2 #define MICBIAS_AVDDV 3 diff --git a/sound/soc/codecs/tlv320aic31xx.c b/sound/soc/codecs/tlv320aic31xx.c index 266141d841e7..44950c1f2532 100644 --- a/sound/soc/codecs/tlv320aic31xx.c +++ b/sound/soc/codecs/tlv320aic31xx.c @@ -1320,6 +1320,7 @@ static int aic31xx_i2c_probe(struct i2c_client *i2c, fwnode_property_read_u32(aic31xx->dev->fwnode, "ai31xx-micbias-vg", &micbias_value); switch (micbias_value) { + case MICBIAS_OFF: case MICBIAS_2_0V: case MICBIAS_2_5V: case MICBIAS_AVDDV: -- 2.15.0
next prev parent reply other threads:[~2017-12-07 15:39 UTC|newest] Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top 2017-12-07 15:38 [PATCH v3 00/10] Add Headphone Detection to TLV320AIC31xx Driver Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 01/10] ASoC: tlv320aic31xx: Fix GPIO header includes Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 17:48 ` Applied "ASoC: tlv320aic31xx: Fix GPIO header includes" to the asoc tree Mark Brown 2017-12-07 15:38 ` [PATCH v3 02/10] ASoC: tlv320aic31xx: Use fwnode APIs over raw OF calls Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 17:48 ` Applied "ASoC: tlv320aic31xx: Use fwnode APIs over raw OF calls" to the asoc tree Mark Brown 2017-12-07 15:38 ` [PATCH v3 03/10] ASoC: tlv320aic31xx: Remove platform data Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis [this message] 2017-12-07 15:38 ` [PATCH v3 04/10] ASoC: tlv320aic31xx: Add MICBIAS off setting Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 05/10] ASoC: tlv320aic31xx: Remove regulator notification handling Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 06/10] ASoC: tlv320aic31xx: Reset registers during power up Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 17:48 ` Applied "ASoC: tlv320aic31xx: Reset registers during power up" to the asoc tree Mark Brown 2017-12-07 15:38 ` [PATCH v3 07/10] ASoC: tlv320aic31xx: Add short circuit detection support Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 08/10] ASoC: tlv320aic31xx: Add overflow " Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:38 ` [PATCH v3 09/10] ASoC: tlv320aic31xx: Add headphone/headset detection Andrew F. Davis 2017-12-07 15:38 ` Andrew F. Davis 2017-12-07 15:39 ` [PATCH v3 10/10] ASoC: tlv320aic31xx: Add button press detection Andrew F. Davis 2017-12-07 15:39 ` Andrew F. Davis
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=20171207153900.9831-5-afd@ti.com \ --to=afd@ti.com \ --cc=alsa-devel@alsa-project.org \ --cc=broonie@kernel.org \ --cc=lgirdwood@gmail.com \ --cc=linux-kernel@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.