Commit a3cc056b authored by Liam Girdwood's avatar Liam Girdwood Committed by Mark Brown
Browse files

ASoC: dapm: Add regulator member to struct dapm_widget 



Currently DAPM widgets use the private data for their regulator.
Add a regulator * for widgets to use instead of private data.

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

include/sound/soc-dapm.h

+2 −0
Original line number Diff line number Diff line
@@ -324,6 +324,7 @@ struct snd_soc_dapm_path; 
struct snd_soc_dapm_pin;

struct snd_soc_dapm_route;

struct snd_soc_dapm_context;

struct regulator;



int dapm_reg_event(struct snd_soc_dapm_widget *w,

		   struct snd_kcontrol *kcontrol, int event);
@@ -487,6 +488,7 @@ struct snd_soc_dapm_widget { 
	struct snd_soc_dapm_context *dapm;



	void *priv;				/* widget specific data */

	struct regulator *regulator;		/* attached regulator */



	/* dapm control */

	short reg;						/* negative reg = no direct dapm */

sound/soc/soc-dapm.c

+5 −5
Original line number Diff line number Diff line
@@ -861,9 +861,9 @@ int dapm_regulator_event(struct snd_soc_dapm_widget *w, 
		   struct snd_kcontrol *kcontrol, int event)

{

	if (SND_SOC_DAPM_EVENT_ON(event))

		return regulator_enable(w->priv);

		return regulator_enable(w->regulator);

	else

		return regulator_disable_deferred(w->priv, w->shift);

		return regulator_disable_deferred(w->regulator, w->shift);

}

EXPORT_SYMBOL_GPL(dapm_regulator_event);
@@ -2768,9 +2768,9 @@ snd_soc_dapm_new_control(struct snd_soc_dapm_context *dapm, 


	switch (w->id) {

	case snd_soc_dapm_regulator_supply:

		w->priv = devm_regulator_get(dapm->dev, w->name);

		if (IS_ERR(w->priv)) {

			ret = PTR_ERR(w->priv);

		w->regulator = devm_regulator_get(dapm->dev, w->name);

		if (IS_ERR(w->regulator)) {

			ret = PTR_ERR(w->regulator);

			dev_err(dapm->dev, "Failed to request %s: %d\n",

				w->name, ret);

			return NULL;