ASoC: Provide REGULATOR_SUPPLY widget type
Subsystems (3)
PATCH 1/3 ASoC: Provide REGULATOR_SUPPLY widget type
Modern devices allow systems to enable and disable individual supplies on the device, allowing additional power saving by switching off regulators which power portions of the device which are not currently in use. Add a new SND_SOC_DAPM_REGULATOR_SUPPLY widget type factoring out the code for managing such widgets from individual drivers.
The widget name will be used as the supply name when requesting the regulator from the regulator API.
Signed-off-by Mark Brown <[email protected]>
--- include/sound/soc-dapm.h | 9 ++++++++ sound/soc/soc-dapm.c | 51 ++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 58 insertions(+), 2 deletions(-)
include/sound/soc-dapm.h +9 -0
@@ -243,6 +243,10 @@ { .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) \ +{ .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 }/* dapm kcontrol types */ #define SOC_DAPM_SINGLE (xname, reg, shift, max, invert) \
@@ -322,6 +326,8 @@ struct snd_soc_dapm_context;int dapm_reg_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event); +int dapm_regulator_event (struct snd_soc_dapm_widget *w, +struct snd_kcontrol *kcontrol,int event);/* dapm controls */ int snd_soc_dapm_put_volsw(struct snd_kcontrol *kcontrol,
@@ -411,6 +417,7 @@ enum snd_soc_dapm_type { snd_soc_dapm_pre,/* machine specific pre widget - exec first */ snd_soc_dapm_post,/* machine specific post widget - exec last */ snd_soc_dapm_supply,/* power/clock supply */ + snd_soc_dapm_regulator_supply,/* external regulator */ snd_soc_dapm_aif_in,/* audio interface input */ snd_soc_dapm_aif_out,/* audio interface output */ snd_soc_dapm_siggen, /* signal generator */
@@ -465,6 +472,8 @@ struct snd_soc_dapm_widget {struct list_head list;struct snd_soc_dapm_context *dapm; +void *priv;/* widget specific data */ +/* dapm control */ short reg;/* negative reg = no direct dapm */ unsigned char shift;/* bits to shift */
sound/soc/soc-dapm.c +49 -2
135 lines not on this page · raw message
Signature · 1 line
1.7.7.3
PATCH 2/3 ASoC: wm8996: Switch to using common code for managing CPVDD supply
Nice code saving.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8996.c | 32 +++++--------------------------- 1 files changed, 5 insertions(+), 27 deletions(-)
sound/soc/codecs/wm8996.c +5 -27
@@ -73,7 +73,6 @@ struct wm8996_priv {struct regulator_bulk_data supplies[WM8996_NUM_SUPPLIES ];struct notifier_block disable_nb[WM8996_NUM_SUPPLIES ]; -struct regulator *cpvdd;int bg_ena;struct wm8996_pdata pdata;
@@ -792,29 +791,18 @@ static int bg_event(struct snd_soc_dapm_widget *w,static int cp_event (struct snd_soc_dapm_widget *w,struct snd_kcontrol *kcontrol,int event) { -struct snd_soc_codec *codec = w->codec; -struct wm8996_priv *wm8996 =snd_soc_codec_get_drvdata (codec);int ret =0 ;switch (event) { -case SND_SOC_DAPM_PRE_PMU : - ret =regulator_enable (wm8996->cpvdd); -if (ret !=0 ) -dev_err (codec->dev,"Failed to enable CPVDD: %d\n" , - ret); -break ;case SND_SOC_DAPM_POST_PMU :msleep (5 );break ; -case SND_SOC_DAPM_POST_PMD : -regulator_disable_deferred (wm8996->cpvdd,20 ); -break ;default :BUG (); ret = -EINVAL ; } -return ret; +return 0 ; } static int rmv_short_event(struct snd_soc_dapm_widget *w,
@@ -1116,12 +1104,12 @@ 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_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 ),SND_SOC_DAPM_SUPPLY_S ("Charge Pump" ,2 ,WM8996_CHARGE_PUMP_1 ,15 ,0 , cp_event, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMU | -SND_SOC_DAPM_POST_PMD ), +SND_SOC_DAPM_POST_PMU ),SND_SOC_DAPM_SUPPLY ("Bandgap" ,SND_SOC_NOPM ,0 ,0 , bg_event,SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ), SND_SOC_DAPM_SUPPLY("LDO2", WM8996_POWER_MANAGEMENT_2, 1, 0, NULL, 0),
@@ -1280,6 +1268,7 @@ static const struct snd_soc_dapm_route wm8996_dapm_routes[] = { { "AIFCLK", NULL, "SYSCLK" }, { "SYSDSPCLK", NULL, "SYSCLK" }, { "Charge Pump", NULL, "SYSCLK" }, + { "Charge Pump", NULL, "CPVDD" }, { "MICB1", NULL, "LDO2" }, { "MICB1", NULL, "MICB1 Audio" },
@@ -3038,7 +3027,6 @@ static int wm8996_remove(struct snd_soc_codec *codec)for (i =0 ; i <ARRAY_SIZE (wm8996->supplies); i++)regulator_unregister_notifier (wm8996->supplies[i].consumer, &wm8996->disable_nb[i]); -regulator_put (wm8996->cpvdd);regulator_bulk_free (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);return 0 ;
@@ -3160,18 +3148,11 @@ static __devinit int wm8996_i2c_probe(struct i2c_client *i2c, goto err_gpio; } - wm8996->cpvdd =regulator_get (&i2c->dev,"CPVDD" ); -if (IS_ERR (wm8996->cpvdd)) { - ret =PTR_ERR (wm8996->cpvdd); -dev_err (&i2c->dev,"Failed to get CPVDD: %d\n" , ret); - goto err_get; - } - ret =regulator_bulk_enable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);if (ret !=0 ) {dev_err (&i2c->dev,"Failed to enable supplies: %d\n" , ret); - goto err_cpvdd; + goto err_get; }if (wm8996->pdata.ldo_ena >0 ) {
@@ -3233,8 +3214,6 @@ err_enable:if (wm8996->pdata.ldo_ena >0 )gpio_set_value_cansleep (wm8996->pdata.ldo_ena,0 );regulator_bulk_disable (ARRAY_SIZE (wm8996->supplies), wm8996->supplies); -err_cpvdd: -regulator_put (wm8996->cpvdd); err_get:regulator_bulk_free (ARRAY_SIZE (wm8996->supplies), wm8996->supplies); err_gpio:
@@ -3251,7 +3230,6 @@ static __devexit int wm8996_i2c_remove(struct i2c_client *client)snd_soc_unregister_codec (&client->dev);wm8996_free_gpio (wm8996); -regulator_put (wm8996->cpvdd);regulator_bulk_free (ARRAY_SIZE (wm8996->supplies), wm8996->supplies);regmap_exit (wm8996->regmap);if (wm8996->pdata.ldo_ena >0 ) {
Signature · 1 line
1.7.7.3
PATCH 3/3 ASoC: wm5100: Move regulator supplies over to DAPM infrastructure
In reply to Mark BrownSaves a nice block of code.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm5100.c | 131 ++++----------------------------------------- 1 files changed, 10 insertions(+), 121 deletions(-)
sound/soc/codecs/wm5100.c +10 -121
@@ -56,9 +56,6 @@ struct wm5100_priv {struct snd_soc_codec *codec;struct regulator_bulk_data core_supplies[WM5100_NUM_CORE_SUPPLIES ]; -struct regulator *cpvdd; -struct regulator *dbvdd2; -struct regulator *dbvdd3;int rev;
@@ -813,85 +810,6 @@ static int wm5100_out_ev(struct snd_soc_dapm_widget *w,return 0 ; } -static int wm5100_cp_ev (struct snd_soc_dapm_widget *w, -struct snd_kcontrol *kcontrol, -int event) -{ -struct snd_soc_codec *codec = w->codec; -struct wm5100_priv *wm5100 =snd_soc_codec_get_drvdata (codec); -int ret; - -switch (event) { -case SND_SOC_DAPM_PRE_PMU : - ret =regulator_enable (wm5100->cpvdd); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to enable CPVDD: %d\n" , - ret); -return ret; - } -return ret; - -case SND_SOC_DAPM_POST_PMD : - ret =regulator_disable_deferred (wm5100->cpvdd,20 ); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to disable CPVDD: %d\n" , - ret); -return ret; - } -return ret; - -default : -BUG (); -return 0 ; - } -} - -static int wm5100_dbvdd_ev (struct snd_soc_dapm_widget *w, -struct snd_kcontrol *kcontrol, -int event) -{ -struct snd_soc_codec *codec = w->codec; -struct wm5100_priv *wm5100 =snd_soc_codec_get_drvdata (codec); -struct regulator *regulator; -int ret; - -switch (w->shift) { -case 2 : - regulator = wm5100->dbvdd2; -break ; -case 3 : - regulator = wm5100->dbvdd3; -break ; -default : -BUG (); -return 0 ; - } - -switch (event) { -case SND_SOC_DAPM_PRE_PMU : - ret =regulator_enable (regulator); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to enable DBVDD%d: %d\n" , - w->shift, ret); -return ret; - } -return ret; - -case SND_SOC_DAPM_POST_PMD : - ret =regulator_disable (regulator); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to enable DBVDD%d: %d\n" , - w->shift, ret); -return ret; - } -return ret; - -default : -BUG (); -return 0 ; - } -} -static void wm5100_log_status3 (struct wm5100_priv *wm5100,int val) {if (val &WM5100_SPK_SHUTDOWN_WARN_EINT )
@@ -972,18 +890,16 @@ 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_SUPPLY ("CP1" ,WM5100_HP_CHARGE_PUMP_1 ,WM5100_CP1_ENA_SHIFT ,0 , - wm5100_cp_ev, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ), +NULL ,0 ),SND_SOC_DAPM_SUPPLY ("CP2" ,WM5100_MIC_CHARGE_PUMP_1 ,WM5100_CP2_ENA_SHIFT ,0 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("CP2 Active" ,WM5100_MIC_CHARGE_PUMP_1 , -WM5100_CP2_BYPASS_SHIFT ,1 , wm5100_cp_ev, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ), -SND_SOC_DAPM_SUPPLY ("DBVDD2" ,SND_SOC_NOPM ,2 ,0 , wm5100_dbvdd_ev, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ), -SND_SOC_DAPM_SUPPLY ("DBVDD3" ,SND_SOC_NOPM ,3 ,0 , wm5100_dbvdd_ev, -SND_SOC_DAPM_PRE_PMU |SND_SOC_DAPM_POST_PMD ), +WM5100_CP2_BYPASS_SHIFT ,1 ,NULL ,0 ),SND_SOC_DAPM_SUPPLY ("MICBIAS1" ,WM5100_MIC_BIAS_CTRL_1 ,WM5100_MICB1_ENA_SHIFT , 0, NULL, 0),
@@ -1215,6 +1131,9 @@ SND_SOC_DAPM_POST("Post", wm5100_post_ev), };static const struct snd_soc_dapm_route wm5100_dapm_routes[] = { + {"CP1" ,NULL ,"CPVDD" }, + {"CP2 Active" ,NULL ,"CPVDD" }, + {"IN1L" ,NULL ,"SYSCLK" }, {"IN1R" ,NULL ,"SYSCLK" }, {"IN2L" ,NULL ,"SYSCLK" },
@@ -2729,33 +2648,12 @@ static __devinit int wm5100_i2c_probe(struct i2c_client *i2c, goto err_regmap; } - wm5100->cpvdd =regulator_get (&i2c->dev,"CPVDD" ); -if (IS_ERR (wm5100->cpvdd)) { - ret =PTR_ERR (wm5100->cpvdd); -dev_err (&i2c->dev,"Failed to get CPVDD: %d\n" , ret); - goto err_core; - } - - wm5100->dbvdd2 =regulator_get (&i2c->dev,"DBVDD2" ); -if (IS_ERR (wm5100->dbvdd2)) { - ret =PTR_ERR (wm5100->dbvdd2); -dev_err (&i2c->dev,"Failed to get DBVDD2: %d\n" , ret); - goto err_cpvdd; - } - - wm5100->dbvdd3 =regulator_get (&i2c->dev,"DBVDD3" ); -if (IS_ERR (wm5100->dbvdd3)) { - ret =PTR_ERR (wm5100->dbvdd3); -dev_err (&i2c->dev,"Failed to get DBVDD2: %d\n" , ret); - goto err_dbvdd2; - } - ret =regulator_bulk_enable (ARRAY_SIZE (wm5100->core_supplies), wm5100->core_supplies);if (ret !=0 ) {dev_err (&i2c->dev,"Failed to enable core supplies: %d\n" , ret); - goto err_dbvdd3; + goto err_core; }if (wm5100->pdata.ldo_ena) {
@@ -2924,12 +2822,6 @@ err_ldo: err_enable:regulator_bulk_disable (ARRAY_SIZE (wm5100->core_supplies), wm5100->core_supplies); -err_dbvdd3: -regulator_put (wm5100->dbvdd3); -err_dbvdd2: -regulator_put (wm5100->dbvdd2); -err_cpvdd: -regulator_put (wm5100->cpvdd); err_core:regulator_bulk_free (ARRAY_SIZE (wm5100->core_supplies), wm5100->core_supplies);
@@ -2955,9 +2847,6 @@ static __devexit int wm5100_i2c_remove(struct i2c_client *i2c)gpio_set_value_cansleep (wm5100->pdata.ldo_ena,0 );gpio_free (wm5100->pdata.ldo_ena); } -regulator_put (wm5100->dbvdd3); -regulator_put (wm5100->dbvdd2); -regulator_put (wm5100->cpvdd);regulator_bulk_free (ARRAY_SIZE (wm5100->core_supplies), wm5100->core_supplies);regmap_exit (wm5100->regmap);
Signature · 1 line
1.7.7.3