ASoC: rt5645: change micbias widget type to supply.
Subsystems (3)
PATCH v2 1/2 ASoC: rt5645: change micbias widget type to supply.
From: Bard Liao <[email protected]>
Register "micbias1" and "micbias2" to supply widgets as modern drivers do.
This should not cause any (new) issues for existing users of the codec, since micbias support is broken anyways. Micbias support needs the RT5645_MICBIAS?_POW_CTRL_SEL bits in the RT5645_GEN_CTRL2 register to be updated when enabled/disabled which we currently do not do.
The updating of these bits will be fixed in a follow-up commit.
---
Changes in v2:
-Update the commit message to explain why changing the type of the widget
is ok / will not cause any (new) issues for existing users of the codec
--- sound/soc/codecs/rt5645.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
sound/soc/codecs/rt5645.c +4 -4
@@ -1980,10 +1980,10 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {/* Input Side */ /* micbias */ -SND_SOC_DAPM_MICBIAS ("micbias1" ,RT5645_PWR_ANLG2 , -RT5645_PWR_MB1_BIT ,0 ), -SND_SOC_DAPM_MICBIAS ("micbias2" ,RT5645_PWR_ANLG2 , -RT5645_PWR_MB2_BIT ,0 ), +SND_SOC_DAPM_SUPPLY ("micbias1" ,RT5645_PWR_ANLG2 , +RT5645_PWR_MB1_BIT ,0 ,NULL ,0 ), +SND_SOC_DAPM_SUPPLY ("micbias2" ,RT5645_PWR_ANLG2 , +RT5645_PWR_MB2_BIT ,0 ,NULL ,0 ),/* Input Lines */ SND_SOC_DAPM_INPUT ("DMIC L1" ), SND_SOC_DAPM_INPUT("DMIC R1"),
Signature · 1 line
2.14.3
PATCH v2 2/2 ASoC: rt5645: add micbias power control select.
From: Bard Liao <[email protected]>
We need to set a corresponding control bit before powering micbias up.
--- sound/soc/codecs/rt5645.c | 56 +++++++++++++++++++++++++++++++++++++++++++++-- sound/soc/codecs/rt5645.h | 6 +++++ 2 files changed, 60 insertions(+), 2 deletions(-)
sound/soc/codecs/rt5645.c +54 -2
@@ -1943,6 +1943,56 @@ static int rt5650_hp_event(struct snd_soc_dapm_widget *w,return 0 ; } +static int rt5645_set_micbias1_event (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *k,int event) +{ +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); + +switch (event) { +case SND_SOC_DAPM_PRE_PMU : +snd_soc_update_bits (codec,RT5645_GEN_CTRL2 , +RT5645_MICBIAS1_POW_CTRL_SEL_MASK , +RT5645_MICBIAS1_POW_CTRL_SEL_M ); +break ; + +case SND_SOC_DAPM_POST_PMD : +snd_soc_update_bits (codec,RT5645_GEN_CTRL2 , +RT5645_MICBIAS1_POW_CTRL_SEL_MASK , +RT5645_MICBIAS1_POW_CTRL_SEL_A ); +break ; + +default : +return 0 ; + } + +return 0 ; +} + +static int rt5645_set_micbias2_event (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *k,int event) +{ +struct snd_soc_codec *codec =snd_soc_dapm_to_codec (w->dapm); + +switch (event) { +case SND_SOC_DAPM_PRE_PMU : +snd_soc_update_bits (codec,RT5645_GEN_CTRL2 , +RT5645_MICBIAS2_POW_CTRL_SEL_MASK , +RT5645_MICBIAS2_POW_CTRL_SEL_M ); +break ; + +case SND_SOC_DAPM_POST_PMD : +snd_soc_update_bits (codec,RT5645_GEN_CTRL2 , +RT5645_MICBIAS2_POW_CTRL_SEL_MASK , +RT5645_MICBIAS2_POW_CTRL_SEL_A ); +break ; + +default : +return 0 ; + } + +return 0 ; +} +static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {SND_SOC_DAPM_SUPPLY ("LDO2" ,RT5645_PWR_MIXER ,RT5645_PWR_LDO2_BIT ,0 ,NULL ,0 ),
@@ -1981,9 +2031,11 @@ static const struct snd_soc_dapm_widget rt5645_dapm_widgets[] = {/* Input Side */ /* micbias */ SND_SOC_DAPM_SUPPLY ("micbias1" ,RT5645_PWR_ANLG2 , -RT5645_PWR_MB1_BIT ,0 ,NULL ,0 ), +RT5645_PWR_MB1_BIT ,0 , rt5645_set_micbias1_event, +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ),SND_SOC_DAPM_SUPPLY ("micbias2" ,RT5645_PWR_ANLG2 , -RT5645_PWR_MB2_BIT ,0 ,NULL ,0 ), +RT5645_PWR_MB2_BIT ,0 , rt5645_set_micbias2_event, +SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ),/* Input Lines */ SND_SOC_DAPM_INPUT ("DMIC L1" ), SND_SOC_DAPM_INPUT("DMIC R1"),
sound/soc/codecs/rt5645.h +6 -0
@@ -2117,6 +2117,12 @@ enum {#define RT5645_RXDC_SRC_STO (0x0 << 7)#define RT5645_RXDC_SRC_MONO (0x1 << 7)#define RT5645_RXDC_SRC_SFT (7) +#define RT5645_MICBIAS1_POW_CTRL_SEL_MASK (0x1 << 5) +#define RT5645_MICBIAS1_POW_CTRL_SEL_A (0x0 << 5) +#define RT5645_MICBIAS1_POW_CTRL_SEL_M (0x1 << 5) +#define RT5645_MICBIAS2_POW_CTRL_SEL_MASK (0x1 << 4) +#define RT5645_MICBIAS2_POW_CTRL_SEL_A (0x0 << 4) +#define RT5645_MICBIAS2_POW_CTRL_SEL_M (0x1 << 4)#define RT5645_RXDP2_SEL_MASK (0x1 << 3)#define RT5645_RXDP2_SEL_IF2 (0x0 << 3)#define RT5645_RXDP2_SEL_ADC (0x1 << 3)
Signature · 1 line
2.14.3