Commit 822b4b8d authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: dapm: Add flags to regulator supplies 



This will be used to enable additional control of the regulators.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
parent 6d97c09c

include/sound/soc-dapm.h

+3 −2
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -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
Original line number Diff line number Diff line
@@ -848,9 +848,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
Original line number Diff line number Diff line
@@ -305,12 +305,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"),