ASoC: dapm: Add flags to regulator supplies
Subsystems (3)
PATCH 1/4 ASoC: dapm: Add flags to regulator supplies
This will be used to enable additional control of the regulators.
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc-dapm.h | 5 +++-- sound/soc/codecs/ab8500-codec.c | 8 ++++---- sound/soc/codecs/wm2200.c | 4 ++-- sound/soc/codecs/wm5100.c | 6 +++--- sound/soc/codecs/wm5102.c | 12 ++++++------ sound/soc/codecs/wm5110.c | 12 ++++++------ sound/soc/codecs/wm8996.c | 2 +- 7 files changed, 25 insertions(+), 24 deletions(-)
include/sound/soc-dapm.h +3 -2
@@ -244,10 +244,11 @@ struct device; { .id = snd_soc_dapm_supply, .name = wname, .reg = wreg, \ .shift = wshift, .invert = winvert, .event = wevent, \ .event_flags = wflags} -#define SND_SOC_DAPM_REGULATOR_SUPPLY (wname, wdelay) \ +#define SND_SOC_DAPM_REGULATOR_SUPPLY (wname, wdelay, wflags) \ { .id = snd_soc_dapm_regulator_supply, .name = wname, \ .reg = SND_SOC_NOPM, .shift = wdelay, .event = dapm_regulator_event, \ - .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD } + .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD, \ + .invert = wflags}/* dapm kcontrol types */
sound/soc/codecs/ab8500-codec.c +4 -4
@@ -390,10 +390,10 @@ static const struct snd_soc_dapm_widget ab8500_dapm_widgets[] = {SND_SOC_DAPM_CLOCK_SUPPLY ("audioclk" ),/* Regulators */ -SND_SOC_DAPM_REGULATOR_SUPPLY ("V-AUD" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("V-AMIC1" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("V-AMIC2" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("V-DMIC" ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("V-AUD" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("V-AMIC1" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("V-AMIC2" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("V-DMIC" ,0 ,0 ),/* Power */ SND_SOC_DAPM_SUPPLY("Audio Power",
sound/soc/codecs/wm2200.c +2 -2
@@ -1117,8 +1117,8 @@ SND_SOC_DAPM_SUPPLY("MICBIAS1", WM2200_MIC_BIAS_CTRL_1, WM2200_MICB1_ENA_SHIFT, 0, NULL, 0),SND_SOC_DAPM_SUPPLY ("MICBIAS2" ,WM2200_MIC_BIAS_CTRL_2 ,WM2200_MICB2_ENA_SHIFT ,0 ,NULL ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("AVDD" ,20 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("AVDD" ,20 ,0 ),SND_SOC_DAPM_INPUT ("IN1L" ), SND_SOC_DAPM_INPUT("IN1R"),
sound/soc/codecs/wm5100.c +3 -3
@@ -893,9 +893,9 @@ SND_SOC_DAPM_SUPPLY("SYSCLK", WM5100_CLOCKING_3, WM5100_SYSCLK_ENA_SHIFT, 0,SND_SOC_DAPM_SUPPLY ("ASYNCCLK" ,WM5100_CLOCKING_6 ,WM5100_ASYNC_CLK_ENA_SHIFT ,0 ,NULL ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ,0 ),SND_SOC_DAPM_SUPPLY ("CP1" ,WM5100_HP_CHARGE_PUMP_1 ,WM5100_CP1_ENA_SHIFT ,0 , NULL, 0),
sound/soc/codecs/wm5102.c +6 -6
@@ -312,12 +312,12 @@ SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,SND_SOC_DAPM_SUPPLY ("ASYNCOPCLK" ,ARIZONA_OUTPUT_ASYNC_CLOCK ,ARIZONA_OPCLK_ASYNC_ENA_SHIFT ,0 ,NULL ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDL" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDR" ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDL" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDR" ,0 ,0 ),SND_SOC_DAPM_SIGGEN ("TONE" ), SND_SOC_DAPM_SIGGEN("NOISE"),
sound/soc/codecs/wm5110.c +6 -6
@@ -359,12 +359,12 @@ SND_SOC_DAPM_SUPPLY("OPCLK", ARIZONA_OUTPUT_SYSTEM_CLOCK,SND_SOC_DAPM_SUPPLY ("ASYNCOPCLK" ,ARIZONA_OUTPUT_ASYNC_CLOCK ,ARIZONA_OPCLK_ASYNC_ENA_SHIFT ,0 ,NULL ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDL" ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDR" ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDL" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDR" ,0 ,0 ),SND_SOC_DAPM_SIGGEN ("TONE" ), SND_SOC_DAPM_SIGGEN("NOISE"),
sound/soc/codecs/wm8996.c +1 -1
@@ -931,7 +931,7 @@ SND_SOC_DAPM_INPUT("IN2RP"),SND_SOC_DAPM_INPUT ("DMIC1DAT" ),SND_SOC_DAPM_INPUT ("DMIC2DAT" ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ,0 ),SND_SOC_DAPM_SUPPLY_S ("SYSCLK" ,1 ,WM8996_AIF_CLOCKING_1 ,0 ,0 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY_S ("SYSDSPCLK" ,2 ,WM8996_CLOCKING_1 ,1 ,0 ,NULL ,0 ), SND_SOC_DAPM_SUPPLY_S("AIFCLK", 2, WM8996_CLOCKING_1, 2, 0, NULL, 0),
Signature · 1 line
1.7.10.4
PATCH 2/4 ASoC: dapm: Allow regulators to bypass as well as disable when idle
Allow regulators managed via DAPM to make use of the bypass support that has recently been added to the regulator API by setting a flag SND_SOC_DAPM_REGULATOR_BYPASS. When this flag is set the regulator will be put into bypass mode before being disabled, allowing the regulator to fall into bypass mode if it can't be disabled due to other users.
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc-dapm.h | 3 +++ sound/soc/soc-dapm.c | 23 +++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-)
include/sound/soc-dapm.h +3 -0
@@ -320,6 +320,9 @@ struct device;#define SND_SOC_DAPM_EVENT_OFF (e) \ (e & (SND_SOC_DAPM_PRE_PMD | SND_SOC_DAPM_POST_PMD)) +/* regulator widget flags */ +#define SND_SOC_DAPM_REGULATOR_BYPASS 0x1/* bypass when disabled */ +struct snd_soc_dapm_widget ;enum snd_soc_dapm_type ;struct snd_soc_dapm_path ;
sound/soc/soc-dapm.c +21 -2
@@ -1019,10 +1019,29 @@ EXPORT_SYMBOL_GPL(dapm_reg_event);int dapm_regulator_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -if (SND_SOC_DAPM_EVENT_ON (event)) +int ret; + +if (SND_SOC_DAPM_EVENT_ON (event)) { +if (w->invert &SND_SOC_DAPM_REGULATOR_BYPASS ) { + ret =regulator_allow_bypass (w->regulator, true); +if (ret !=0 ) +dev_warn (w->dapm->dev, +"Failed to bypass %s: %d\n" , + w->name, ret); + } +return regulator_enable (w->regulator); -else + }else { +if (w->invert &SND_SOC_DAPM_REGULATOR_BYPASS ) { + ret =regulator_allow_bypass (w->regulator, false); +if (ret !=0 ) +dev_warn (w->dapm->dev, +"Failed to unbypass %s: %d\n" , + w->name, ret); + } +return regulator_disable_deferred (w->regulator, w->shift); + } }EXPORT_SYMBOL_GPL (dapm_regulator_event);
Signature · 1 line
1.7.10.4
PATCH 3/4 ASoC: wm5102: Enable bypass mode for MICVDD
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5102.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm5102.c +1 -1
@@ -315,7 +315,7 @@ SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ,0 ),SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ,0 ),SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ,SND_SOC_DAPM_REGULATOR_BYPASS ),SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDL" ,0 ,0 ), SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDR", 0, 0),
Signature · 1 line
1.7.10.4
PATCH 4/4 ASoC: wm5110: Enable bypass mode for MICVDD
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5110.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/codecs/wm5110.c +1 -1
@@ -362,7 +362,7 @@ SND_SOC_DAPM_SUPPLY("ASYNCOPCLK", ARIZONA_OUTPUT_ASYNC_CLOCK,SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD2" ,0 ,0 ),SND_SOC_DAPM_REGULATOR_SUPPLY ("DBVDD3" ,0 ,0 ),SND_SOC_DAPM_REGULATOR_SUPPLY ("CPVDD" ,20 ,0 ), -SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ,0 ), +SND_SOC_DAPM_REGULATOR_SUPPLY ("MICVDD" ,0 ,SND_SOC_DAPM_REGULATOR_BYPASS ),SND_SOC_DAPM_REGULATOR_SUPPLY ("SPKVDDL" ,0 ,0 ), SND_SOC_DAPM_REGULATOR_SUPPLY("SPKVDDR", 0, 0),
Signature · 1 line
1.7.10.4
Quoted 3 lines · Mark Brown
This will be used to enable additional control of the regulators.
Signed-off-by Mark Brown <[email protected]>
All
Acked-by Liam Girdwood <[email protected]>