* [alsa-devel] [PATCH v2 2/2] ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3
2020-01-14 18:12 [alsa-devel] [PATCH v2 1/2] ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal Stephan Gerhold
@ 2020-01-14 18:12 ` Stephan Gerhold
2020-01-14 18:25 ` Srinivas Kandagatla
2020-01-17 15:44 ` [alsa-devel] Applied "ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3" to the asoc tree Mark Brown
2020-01-14 18:25 ` [alsa-devel] [PATCH v2 1/2] ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal Srinivas Kandagatla
2020-01-17 15:44 ` [alsa-devel] Applied "ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal" to the asoc tree Mark Brown
2 siblings, 2 replies; 6+ messages in thread
From: Stephan Gerhold @ 2020-01-14 18:12 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Stephan Gerhold, Takashi Iwai, Liam Girdwood,
Srinivas Kandagatla, ~postmarketos/upstreaming, Nikita Travkin
PM8916 has three TX inputs that each have an (optional) internal
RBIAS resistor. MIC BIAS Internal1/2 (for TX1/2) are already supported.
TX3 does not have its own MIC BIAS supply, instead it is also supplied
from MIC_BIAS1.
Now that we have simplified the MIC BIAS Internal* implementation
we can easily add support for it:
Add a MIC BIAS Internal3 supply that enables the internal RBIAS
resistor on TX3, and make sure to also enable the MIC_BIAS1 supply.
Tested-by: Nikita Travkin <nikitos.tr@gmail.com> # longcheer-l8150
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
---
v1: https://lore.kernel.org/alsa-devel/20200111164006.43074-5-stephan@gerhold.net/
Changes in v2:
- Update for changes in previous patch
(Use new "MIC_BIAS1" supply instead of "MIC BIAS External1")
---
sound/soc/codecs/msm8916-wcd-analog.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
index d6d727f5bae5..85bc7ae4d267 100644
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@ -856,6 +856,7 @@ static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
{"MIC BIAS Internal1", NULL, "MIC_BIAS1"},
{"MIC BIAS External2", NULL, "MIC_BIAS2"},
{"MIC BIAS Internal2", NULL, "MIC_BIAS2"},
+ {"MIC BIAS Internal3", NULL, "MIC_BIAS1"},
};
static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
@@ -924,6 +925,9 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
pm8916_wcd_analog_enable_micbias_int2,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
SND_SOC_DAPM_POST_PMD),
+ SND_SOC_DAPM_SUPPLY("MIC BIAS Internal3", CDC_A_MICB_1_INT_RBIAS, 1, 0,
+ pm8916_wcd_analog_enable_micbias_int,
+ SND_SOC_DAPM_PRE_PMU),
SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0,
pm8916_wcd_analog_enable_adc,
--
2.24.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [alsa-devel] [PATCH v2 2/2] ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3
2020-01-14 18:12 ` [alsa-devel] [PATCH v2 2/2] ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3 Stephan Gerhold
@ 2020-01-14 18:25 ` Srinivas Kandagatla
2020-01-17 15:44 ` [alsa-devel] Applied "ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3" to the asoc tree Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2020-01-14 18:25 UTC (permalink / raw)
To: Stephan Gerhold, Mark Brown
Cc: alsa-devel, Takashi Iwai, Liam Girdwood,
~postmarketos/upstreaming, Nikita Travkin
On 14/01/2020 18:12, Stephan Gerhold wrote:
> PM8916 has three TX inputs that each have an (optional) internal
> RBIAS resistor. MIC BIAS Internal1/2 (for TX1/2) are already supported.
> TX3 does not have its own MIC BIAS supply, instead it is also supplied
> from MIC_BIAS1.
>
> Now that we have simplified the MIC BIAS Internal* implementation
> we can easily add support for it:
>
> Add a MIC BIAS Internal3 supply that enables the internal RBIAS
> resistor on TX3, and make sure to also enable the MIC_BIAS1 supply.
>
> Tested-by: Nikita Travkin <nikitos.tr@gmail.com> # longcheer-l8150
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> v1: https://lore.kernel.org/alsa-devel/20200111164006.43074-5-stephan@gerhold.net/
> Changes in v2:
> - Update for changes in previous patch
> (Use new "MIC_BIAS1" supply instead of "MIC BIAS External1")
> ---
> sound/soc/codecs/msm8916-wcd-analog.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
> index d6d727f5bae5..85bc7ae4d267 100644
> --- a/sound/soc/codecs/msm8916-wcd-analog.c
> +++ b/sound/soc/codecs/msm8916-wcd-analog.c
> @@ -856,6 +856,7 @@ static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
> {"MIC BIAS Internal1", NULL, "MIC_BIAS1"},
> {"MIC BIAS External2", NULL, "MIC_BIAS2"},
> {"MIC BIAS Internal2", NULL, "MIC_BIAS2"},
> + {"MIC BIAS Internal3", NULL, "MIC_BIAS1"},
> };
>
> static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
> @@ -924,6 +925,9 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
> pm8916_wcd_analog_enable_micbias_int2,
> SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
> SND_SOC_DAPM_POST_PMD),
> + SND_SOC_DAPM_SUPPLY("MIC BIAS Internal3", CDC_A_MICB_1_INT_RBIAS, 1, 0,
> + pm8916_wcd_analog_enable_micbias_int,
> + SND_SOC_DAPM_PRE_PMU),
>
> SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0,
> pm8916_wcd_analog_enable_adc,
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 6+ messages in thread* [alsa-devel] Applied "ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3" to the asoc tree
2020-01-14 18:12 ` [alsa-devel] [PATCH v2 2/2] ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3 Stephan Gerhold
2020-01-14 18:25 ` Srinivas Kandagatla
@ 2020-01-17 15:44 ` Mark Brown
1 sibling, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-01-17 15:44 UTC (permalink / raw)
To: Stephan Gerhold
Cc: alsa-devel, Takashi Iwai, Liam Girdwood, Mark Brown,
Srinivas Kandagatla, ~postmarketos/upstreaming, Nikita Travkin
The patch
ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 00d852326e524214f046a5e1301eee84535a6863 Mon Sep 17 00:00:00 2001
From: Stephan Gerhold <stephan@gerhold.net>
Date: Tue, 14 Jan 2020 19:12:29 +0100
Subject: [PATCH] ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3
PM8916 has three TX inputs that each have an (optional) internal
RBIAS resistor. MIC BIAS Internal1/2 (for TX1/2) are already supported.
TX3 does not have its own MIC BIAS supply, instead it is also supplied
from MIC_BIAS1.
Now that we have simplified the MIC BIAS Internal* implementation
we can easily add support for it:
Add a MIC BIAS Internal3 supply that enables the internal RBIAS
resistor on TX3, and make sure to also enable the MIC_BIAS1 supply.
Tested-by: Nikita Travkin <nikitos.tr@gmail.com> # longcheer-l8150
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200114181229.42302-2-stephan@gerhold.net
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/msm8916-wcd-analog.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
index d6d727f5bae5..85bc7ae4d267 100644
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@ -856,6 +856,7 @@ static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
{"MIC BIAS Internal1", NULL, "MIC_BIAS1"},
{"MIC BIAS External2", NULL, "MIC_BIAS2"},
{"MIC BIAS Internal2", NULL, "MIC_BIAS2"},
+ {"MIC BIAS Internal3", NULL, "MIC_BIAS1"},
};
static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
@@ -924,6 +925,9 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
pm8916_wcd_analog_enable_micbias_int2,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
SND_SOC_DAPM_POST_PMD),
+ SND_SOC_DAPM_SUPPLY("MIC BIAS Internal3", CDC_A_MICB_1_INT_RBIAS, 1, 0,
+ pm8916_wcd_analog_enable_micbias_int,
+ SND_SOC_DAPM_PRE_PMU),
SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0,
pm8916_wcd_analog_enable_adc,
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [alsa-devel] [PATCH v2 1/2] ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal
2020-01-14 18:12 [alsa-devel] [PATCH v2 1/2] ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal Stephan Gerhold
2020-01-14 18:12 ` [alsa-devel] [PATCH v2 2/2] ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3 Stephan Gerhold
@ 2020-01-14 18:25 ` Srinivas Kandagatla
2020-01-17 15:44 ` [alsa-devel] Applied "ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal" to the asoc tree Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Srinivas Kandagatla @ 2020-01-14 18:25 UTC (permalink / raw)
To: Stephan Gerhold, Mark Brown
Cc: alsa-devel, Takashi Iwai, Liam Girdwood,
~postmarketos/upstreaming, Nikita Travkin
On 14/01/2020 18:12, Stephan Gerhold wrote:
> At the moment, MIC BIAS Internal* and MIC BIAS External* both reference
> the same register, and have a part of their initialization sequence
> duplicated.
>
> For example, the sequence for enabling MIC BIAS Internal1 is:
> I1. Enable MIC_BIAS1 supply (MICB_EN bit in CDC_A_MICB_1_EN)
> I2. Enable internal RBIAS (TX1_INT_RBIAS_EN bit in CDC_A_MICB_1_INT_RBIAS)
>
> The sequence for enabling MIC BIAS External1 is:
> E1. Enable MIC_BIAS1 supply (MICB_EN bit in CDC_A_MICB_1_EN)
> (E2. Ideally, make sure internal RBIAS is disabled. However, this should
> not happen in practice because DAPM will disable unused supplies...)
>
> Right now we have:
> SND_SOC_DAPM_SUPPLY("MIC BIAS Internal1", CDC_A_MICB_1_EN, 7, 0, ...) // I1
> SND_SOC_DAPM_SUPPLY("MIC BIAS External1", CDC_A_MICB_1_EN, 7, 0, ...) // E1
> and I2 is done in the PM event handler (pm8916_wcd_analog_enable_micbias_int1).
>
> We can simplify this by defining a common DAPM supply for I1/E1 ("MIC_BIAS1"),
> and one DAPM supply for I2 ("MIC BIAS Internal1"). Additional DAPM routes
> ensure that we also enable the MIC_BIAS1 supply for the internal and external
> pull up resistor.
>
> Another advantage of this is that we now disable the internal RBIAS
> when it is not needed. This makes it much easier to add support for
> MIC BIAS Internal3 as a next step.
>
> Tested-by: Nikita Travkin <nikitos.tr@gmail.com> # longcheer-l8150
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Thanks for the patch, routing looks much better now!
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> ---
> v1: https://lore.kernel.org/alsa-devel/20200111164006.43074-4-stephan@gerhold.net/
> Changes in v2:
> - Use an extra DAPM supply for MIC_BIASX that is referenced by
> MIC BIAS InternalX and MIC BIAS ExternalX, instead of combining it with
> MIC BIAS ExternalX
> - Clarify commit message
> ---
> sound/soc/codecs/msm8916-wcd-analog.c | 112 ++++++++++----------------
> 1 file changed, 42 insertions(+), 70 deletions(-)
>
> diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
> index 1f7964beb20c..d6d727f5bae5 100644
> --- a/sound/soc/codecs/msm8916-wcd-analog.c
> +++ b/sound/soc/codecs/msm8916-wcd-analog.c
> @@ -374,9 +374,8 @@ static void pm8916_wcd_analog_micbias_enable(struct snd_soc_component *component
>
> }
>
> -static int pm8916_wcd_analog_enable_micbias_ext(struct snd_soc_component
> - *component, int event,
> - int reg, unsigned int cap_mode)
> +static int pm8916_wcd_analog_enable_micbias(struct snd_soc_component *component,
> + int event, unsigned int cap_mode)
> {
> switch (event) {
> case SND_SOC_DAPM_POST_PMU:
> @@ -389,72 +388,44 @@ static int pm8916_wcd_analog_enable_micbias_ext(struct snd_soc_component
> return 0;
> }
>
> -static int pm8916_wcd_analog_enable_micbias_int(struct snd_soc_component
> - *component, int event,
> - int reg, u32 cap_mode)
> +static int pm8916_wcd_analog_enable_micbias_int(struct snd_soc_dapm_widget *w,
> + struct snd_kcontrol *kcontrol,
> + int event)
> {
> + struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
>
> switch (event) {
> case SND_SOC_DAPM_PRE_PMU:
> - snd_soc_component_update_bits(component, reg, MICB_1_EN_PULL_DOWN_EN_MASK, 0);
> snd_soc_component_update_bits(component, CDC_A_MICB_1_EN,
> MICB_1_EN_OPA_STG2_TAIL_CURR_MASK,
> MICB_1_EN_OPA_STG2_TAIL_CURR_1_60UA);
> -
> - break;
> - case SND_SOC_DAPM_POST_PMU:
> - pm8916_wcd_analog_micbias_enable(component);
> - snd_soc_component_update_bits(component, CDC_A_MICB_1_EN,
> - MICB_1_EN_BYP_CAP_MASK, cap_mode);
> break;
> }
>
> return 0;
> }
>
> -static int pm8916_wcd_analog_enable_micbias_ext1(struct
> - snd_soc_dapm_widget
> - *w, struct snd_kcontrol
> - *kcontrol, int event)
> +static int pm8916_wcd_analog_enable_micbias1(struct snd_soc_dapm_widget *w,
> + struct snd_kcontrol *kcontrol,
> + int event)
> {
> struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
> struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);
>
> - return pm8916_wcd_analog_enable_micbias_ext(component, event, w->reg,
> - wcd->micbias1_cap_mode);
> + return pm8916_wcd_analog_enable_micbias(component, event,
> + wcd->micbias1_cap_mode);
> }
>
> -static int pm8916_wcd_analog_enable_micbias_ext2(struct
> - snd_soc_dapm_widget
> - *w, struct snd_kcontrol
> - *kcontrol, int event)
> -{
> - struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
> - struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);
> -
> - return pm8916_wcd_analog_enable_micbias_ext(component, event, w->reg,
> - wcd->micbias2_cap_mode);
> -
> -}
> -
> -static int pm8916_wcd_analog_enable_micbias_int1(struct
> - snd_soc_dapm_widget
> - *w, struct snd_kcontrol
> - *kcontrol, int event)
> +static int pm8916_wcd_analog_enable_micbias2(struct snd_soc_dapm_widget *w,
> + struct snd_kcontrol *kcontrol,
> + int event)
> {
> struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
> struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);
>
> - switch (event) {
> - case SND_SOC_DAPM_PRE_PMU:
> - snd_soc_component_update_bits(component, CDC_A_MICB_1_INT_RBIAS,
> - MICB_1_INT_TX1_INT_RBIAS_EN_MASK,
> - MICB_1_INT_TX1_INT_RBIAS_EN_ENABLE);
> - break;
> - }
> + return pm8916_wcd_analog_enable_micbias(component, event,
> + wcd->micbias2_cap_mode);
>
> - return pm8916_wcd_analog_enable_micbias_int(component, event, w->reg,
> - wcd->micbias1_cap_mode);
> }
>
> static int pm8916_mbhc_configure_bias(struct pm8916_wcd_analog_priv *priv,
> @@ -564,9 +535,8 @@ static int pm8916_wcd_analog_enable_micbias_int2(struct
>
> switch (event) {
> case SND_SOC_DAPM_PRE_PMU:
> - snd_soc_component_update_bits(component, CDC_A_MICB_1_INT_RBIAS,
> - MICB_1_INT_TX2_INT_RBIAS_EN_MASK,
> - MICB_1_INT_TX2_INT_RBIAS_EN_ENABLE);
> + snd_soc_component_update_bits(component, CDC_A_MICB_2_EN,
> + CDC_A_MICB_2_PULL_DOWN_EN_MASK, 0);
> break;
> case SND_SOC_DAPM_POST_PMU:
> pm8916_mbhc_configure_bias(wcd, true);
> @@ -576,8 +546,7 @@ static int pm8916_wcd_analog_enable_micbias_int2(struct
> break;
> }
>
> - return pm8916_wcd_analog_enable_micbias_int(component, event, w->reg,
> - wcd->micbias2_cap_mode);
> + return pm8916_wcd_analog_enable_micbias_int(w, kcontrol, event);
> }
>
> static int pm8916_wcd_analog_enable_adc(struct snd_soc_dapm_widget *w,
> @@ -878,14 +847,15 @@ static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
> {"SPK PA", NULL, "SPK DAC"},
> {"SPK DAC", "Switch", "PDM_RX3"},
>
> - {"MIC BIAS Internal1", NULL, "INT_LDO_H"},
> - {"MIC BIAS Internal2", NULL, "INT_LDO_H"},
> - {"MIC BIAS External1", NULL, "INT_LDO_H"},
> - {"MIC BIAS External2", NULL, "INT_LDO_H"},
> - {"MIC BIAS Internal1", NULL, "vdd-micbias"},
> - {"MIC BIAS Internal2", NULL, "vdd-micbias"},
> - {"MIC BIAS External1", NULL, "vdd-micbias"},
> - {"MIC BIAS External2", NULL, "vdd-micbias"},
> + {"MIC_BIAS1", NULL, "INT_LDO_H"},
> + {"MIC_BIAS2", NULL, "INT_LDO_H"},
> + {"MIC_BIAS1", NULL, "vdd-micbias"},
> + {"MIC_BIAS2", NULL, "vdd-micbias"},
> +
> + {"MIC BIAS External1", NULL, "MIC_BIAS1"},
> + {"MIC BIAS Internal1", NULL, "MIC_BIAS1"},
> + {"MIC BIAS External2", NULL, "MIC_BIAS2"},
> + {"MIC BIAS Internal2", NULL, "MIC_BIAS2"},
> };
>
> static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
> @@ -937,22 +907,24 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
> SND_SOC_DAPM_SUPPLY("RX_BIAS", CDC_A_RX_COM_BIAS_DAC, 7, 0, NULL, 0),
>
> /* TX */
> - SND_SOC_DAPM_SUPPLY("MIC BIAS Internal1", CDC_A_MICB_1_EN, 7, 0,
> - pm8916_wcd_analog_enable_micbias_int1,
> - SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
> - SND_SOC_DAPM_POST_PMD),
> - SND_SOC_DAPM_SUPPLY("MIC BIAS Internal2", CDC_A_MICB_2_EN, 7, 0,
> + SND_SOC_DAPM_SUPPLY("MIC_BIAS1", CDC_A_MICB_1_EN, 7, 0,
> + pm8916_wcd_analog_enable_micbias1,
> + SND_SOC_DAPM_POST_PMU),
> + SND_SOC_DAPM_SUPPLY("MIC_BIAS2", CDC_A_MICB_2_EN, 7, 0,
> + pm8916_wcd_analog_enable_micbias2,
> + SND_SOC_DAPM_POST_PMU),
> +
> + SND_SOC_DAPM_SUPPLY("MIC BIAS External1", SND_SOC_NOPM, 0, 0, NULL, 0),
> + SND_SOC_DAPM_SUPPLY("MIC BIAS External2", SND_SOC_NOPM, 0, 0, NULL, 0),
> +
> + SND_SOC_DAPM_SUPPLY("MIC BIAS Internal1", CDC_A_MICB_1_INT_RBIAS, 7, 0,
> + pm8916_wcd_analog_enable_micbias_int,
> + SND_SOC_DAPM_PRE_PMU),
> + SND_SOC_DAPM_SUPPLY("MIC BIAS Internal2", CDC_A_MICB_1_INT_RBIAS, 4, 0,
> pm8916_wcd_analog_enable_micbias_int2,
> SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
> SND_SOC_DAPM_POST_PMD),
>
> - SND_SOC_DAPM_SUPPLY("MIC BIAS External1", CDC_A_MICB_1_EN, 7, 0,
> - pm8916_wcd_analog_enable_micbias_ext1,
> - SND_SOC_DAPM_POST_PMU),
> - SND_SOC_DAPM_SUPPLY("MIC BIAS External2", CDC_A_MICB_2_EN, 7, 0,
> - pm8916_wcd_analog_enable_micbias_ext2,
> - SND_SOC_DAPM_POST_PMU),
> -
> SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0,
> pm8916_wcd_analog_enable_adc,
> SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
>
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply [flat|nested] 6+ messages in thread* [alsa-devel] Applied "ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal" to the asoc tree
2020-01-14 18:12 [alsa-devel] [PATCH v2 1/2] ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal Stephan Gerhold
2020-01-14 18:12 ` [alsa-devel] [PATCH v2 2/2] ASoC: msm8916-wcd-analog: Add MIC BIAS Internal3 Stephan Gerhold
2020-01-14 18:25 ` [alsa-devel] [PATCH v2 1/2] ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal Srinivas Kandagatla
@ 2020-01-17 15:44 ` Mark Brown
2 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2020-01-17 15:44 UTC (permalink / raw)
To: Stephan Gerhold
Cc: alsa-devel, Takashi Iwai, Liam Girdwood, Mark Brown,
Srinivas Kandagatla, ~postmarketos/upstreaming, Nikita Travkin
The patch
ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal
has been applied to the asoc tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-5.6
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
From 65fe457e7bafcbb844c66e8c54a414f090967eaa Mon Sep 17 00:00:00 2001
From: Stephan Gerhold <stephan@gerhold.net>
Date: Tue, 14 Jan 2020 19:12:28 +0100
Subject: [PATCH] ASoC: msm8916-wcd-analog: Simplify MIC BIAS Internal
At the moment, MIC BIAS Internal* and MIC BIAS External* both reference
the same register, and have a part of their initialization sequence
duplicated.
For example, the sequence for enabling MIC BIAS Internal1 is:
I1. Enable MIC_BIAS1 supply (MICB_EN bit in CDC_A_MICB_1_EN)
I2. Enable internal RBIAS (TX1_INT_RBIAS_EN bit in CDC_A_MICB_1_INT_RBIAS)
The sequence for enabling MIC BIAS External1 is:
E1. Enable MIC_BIAS1 supply (MICB_EN bit in CDC_A_MICB_1_EN)
(E2. Ideally, make sure internal RBIAS is disabled. However, this should
not happen in practice because DAPM will disable unused supplies...)
Right now we have:
SND_SOC_DAPM_SUPPLY("MIC BIAS Internal1", CDC_A_MICB_1_EN, 7, 0, ...) // I1
SND_SOC_DAPM_SUPPLY("MIC BIAS External1", CDC_A_MICB_1_EN, 7, 0, ...) // E1
and I2 is done in the PM event handler (pm8916_wcd_analog_enable_micbias_int1).
We can simplify this by defining a common DAPM supply for I1/E1 ("MIC_BIAS1"),
and one DAPM supply for I2 ("MIC BIAS Internal1"). Additional DAPM routes
ensure that we also enable the MIC_BIAS1 supply for the internal and external
pull up resistor.
Another advantage of this is that we now disable the internal RBIAS
when it is not needed. This makes it much easier to add support for
MIC BIAS Internal3 as a next step.
Tested-by: Nikita Travkin <nikitos.tr@gmail.com> # longcheer-l8150
Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Stephan Gerhold <stephan@gerhold.net>
Reviewed-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Link: https://lore.kernel.org/r/20200114181229.42302-1-stephan@gerhold.net
Signed-off-by: Mark Brown <broonie@kernel.org>
---
sound/soc/codecs/msm8916-wcd-analog.c | 112 ++++++++++----------------
1 file changed, 42 insertions(+), 70 deletions(-)
diff --git a/sound/soc/codecs/msm8916-wcd-analog.c b/sound/soc/codecs/msm8916-wcd-analog.c
index 1f7964beb20c..d6d727f5bae5 100644
--- a/sound/soc/codecs/msm8916-wcd-analog.c
+++ b/sound/soc/codecs/msm8916-wcd-analog.c
@@ -374,9 +374,8 @@ static void pm8916_wcd_analog_micbias_enable(struct snd_soc_component *component
}
-static int pm8916_wcd_analog_enable_micbias_ext(struct snd_soc_component
- *component, int event,
- int reg, unsigned int cap_mode)
+static int pm8916_wcd_analog_enable_micbias(struct snd_soc_component *component,
+ int event, unsigned int cap_mode)
{
switch (event) {
case SND_SOC_DAPM_POST_PMU:
@@ -389,72 +388,44 @@ static int pm8916_wcd_analog_enable_micbias_ext(struct snd_soc_component
return 0;
}
-static int pm8916_wcd_analog_enable_micbias_int(struct snd_soc_component
- *component, int event,
- int reg, u32 cap_mode)
+static int pm8916_wcd_analog_enable_micbias_int(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol,
+ int event)
{
+ struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- snd_soc_component_update_bits(component, reg, MICB_1_EN_PULL_DOWN_EN_MASK, 0);
snd_soc_component_update_bits(component, CDC_A_MICB_1_EN,
MICB_1_EN_OPA_STG2_TAIL_CURR_MASK,
MICB_1_EN_OPA_STG2_TAIL_CURR_1_60UA);
-
- break;
- case SND_SOC_DAPM_POST_PMU:
- pm8916_wcd_analog_micbias_enable(component);
- snd_soc_component_update_bits(component, CDC_A_MICB_1_EN,
- MICB_1_EN_BYP_CAP_MASK, cap_mode);
break;
}
return 0;
}
-static int pm8916_wcd_analog_enable_micbias_ext1(struct
- snd_soc_dapm_widget
- *w, struct snd_kcontrol
- *kcontrol, int event)
+static int pm8916_wcd_analog_enable_micbias1(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol,
+ int event)
{
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);
- return pm8916_wcd_analog_enable_micbias_ext(component, event, w->reg,
- wcd->micbias1_cap_mode);
+ return pm8916_wcd_analog_enable_micbias(component, event,
+ wcd->micbias1_cap_mode);
}
-static int pm8916_wcd_analog_enable_micbias_ext2(struct
- snd_soc_dapm_widget
- *w, struct snd_kcontrol
- *kcontrol, int event)
-{
- struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
- struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);
-
- return pm8916_wcd_analog_enable_micbias_ext(component, event, w->reg,
- wcd->micbias2_cap_mode);
-
-}
-
-static int pm8916_wcd_analog_enable_micbias_int1(struct
- snd_soc_dapm_widget
- *w, struct snd_kcontrol
- *kcontrol, int event)
+static int pm8916_wcd_analog_enable_micbias2(struct snd_soc_dapm_widget *w,
+ struct snd_kcontrol *kcontrol,
+ int event)
{
struct snd_soc_component *component = snd_soc_dapm_to_component(w->dapm);
struct pm8916_wcd_analog_priv *wcd = snd_soc_component_get_drvdata(component);
- switch (event) {
- case SND_SOC_DAPM_PRE_PMU:
- snd_soc_component_update_bits(component, CDC_A_MICB_1_INT_RBIAS,
- MICB_1_INT_TX1_INT_RBIAS_EN_MASK,
- MICB_1_INT_TX1_INT_RBIAS_EN_ENABLE);
- break;
- }
+ return pm8916_wcd_analog_enable_micbias(component, event,
+ wcd->micbias2_cap_mode);
- return pm8916_wcd_analog_enable_micbias_int(component, event, w->reg,
- wcd->micbias1_cap_mode);
}
static int pm8916_mbhc_configure_bias(struct pm8916_wcd_analog_priv *priv,
@@ -564,9 +535,8 @@ static int pm8916_wcd_analog_enable_micbias_int2(struct
switch (event) {
case SND_SOC_DAPM_PRE_PMU:
- snd_soc_component_update_bits(component, CDC_A_MICB_1_INT_RBIAS,
- MICB_1_INT_TX2_INT_RBIAS_EN_MASK,
- MICB_1_INT_TX2_INT_RBIAS_EN_ENABLE);
+ snd_soc_component_update_bits(component, CDC_A_MICB_2_EN,
+ CDC_A_MICB_2_PULL_DOWN_EN_MASK, 0);
break;
case SND_SOC_DAPM_POST_PMU:
pm8916_mbhc_configure_bias(wcd, true);
@@ -576,8 +546,7 @@ static int pm8916_wcd_analog_enable_micbias_int2(struct
break;
}
- return pm8916_wcd_analog_enable_micbias_int(component, event, w->reg,
- wcd->micbias2_cap_mode);
+ return pm8916_wcd_analog_enable_micbias_int(w, kcontrol, event);
}
static int pm8916_wcd_analog_enable_adc(struct snd_soc_dapm_widget *w,
@@ -878,14 +847,15 @@ static const struct snd_soc_dapm_route pm8916_wcd_analog_audio_map[] = {
{"SPK PA", NULL, "SPK DAC"},
{"SPK DAC", "Switch", "PDM_RX3"},
- {"MIC BIAS Internal1", NULL, "INT_LDO_H"},
- {"MIC BIAS Internal2", NULL, "INT_LDO_H"},
- {"MIC BIAS External1", NULL, "INT_LDO_H"},
- {"MIC BIAS External2", NULL, "INT_LDO_H"},
- {"MIC BIAS Internal1", NULL, "vdd-micbias"},
- {"MIC BIAS Internal2", NULL, "vdd-micbias"},
- {"MIC BIAS External1", NULL, "vdd-micbias"},
- {"MIC BIAS External2", NULL, "vdd-micbias"},
+ {"MIC_BIAS1", NULL, "INT_LDO_H"},
+ {"MIC_BIAS2", NULL, "INT_LDO_H"},
+ {"MIC_BIAS1", NULL, "vdd-micbias"},
+ {"MIC_BIAS2", NULL, "vdd-micbias"},
+
+ {"MIC BIAS External1", NULL, "MIC_BIAS1"},
+ {"MIC BIAS Internal1", NULL, "MIC_BIAS1"},
+ {"MIC BIAS External2", NULL, "MIC_BIAS2"},
+ {"MIC BIAS Internal2", NULL, "MIC_BIAS2"},
};
static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
@@ -937,22 +907,24 @@ static const struct snd_soc_dapm_widget pm8916_wcd_analog_dapm_widgets[] = {
SND_SOC_DAPM_SUPPLY("RX_BIAS", CDC_A_RX_COM_BIAS_DAC, 7, 0, NULL, 0),
/* TX */
- SND_SOC_DAPM_SUPPLY("MIC BIAS Internal1", CDC_A_MICB_1_EN, 7, 0,
- pm8916_wcd_analog_enable_micbias_int1,
- SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
- SND_SOC_DAPM_POST_PMD),
- SND_SOC_DAPM_SUPPLY("MIC BIAS Internal2", CDC_A_MICB_2_EN, 7, 0,
+ SND_SOC_DAPM_SUPPLY("MIC_BIAS1", CDC_A_MICB_1_EN, 7, 0,
+ pm8916_wcd_analog_enable_micbias1,
+ SND_SOC_DAPM_POST_PMU),
+ SND_SOC_DAPM_SUPPLY("MIC_BIAS2", CDC_A_MICB_2_EN, 7, 0,
+ pm8916_wcd_analog_enable_micbias2,
+ SND_SOC_DAPM_POST_PMU),
+
+ SND_SOC_DAPM_SUPPLY("MIC BIAS External1", SND_SOC_NOPM, 0, 0, NULL, 0),
+ SND_SOC_DAPM_SUPPLY("MIC BIAS External2", SND_SOC_NOPM, 0, 0, NULL, 0),
+
+ SND_SOC_DAPM_SUPPLY("MIC BIAS Internal1", CDC_A_MICB_1_INT_RBIAS, 7, 0,
+ pm8916_wcd_analog_enable_micbias_int,
+ SND_SOC_DAPM_PRE_PMU),
+ SND_SOC_DAPM_SUPPLY("MIC BIAS Internal2", CDC_A_MICB_1_INT_RBIAS, 4, 0,
pm8916_wcd_analog_enable_micbias_int2,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
SND_SOC_DAPM_POST_PMD),
- SND_SOC_DAPM_SUPPLY("MIC BIAS External1", CDC_A_MICB_1_EN, 7, 0,
- pm8916_wcd_analog_enable_micbias_ext1,
- SND_SOC_DAPM_POST_PMU),
- SND_SOC_DAPM_SUPPLY("MIC BIAS External2", CDC_A_MICB_2_EN, 7, 0,
- pm8916_wcd_analog_enable_micbias_ext2,
- SND_SOC_DAPM_POST_PMU),
-
SND_SOC_DAPM_ADC_E("ADC1", NULL, CDC_A_TX_1_EN, 7, 0,
pm8916_wcd_analog_enable_adc,
SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMU |
--
2.20.1
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
^ permalink raw reply related [flat|nested] 6+ messages in thread