diff options
author | Liam Girdwood <lrg@ti.com> | 2012-03-09 12:20:16 -0500 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-04-01 06:28:22 -0400 |
commit | a3cc056b64065efaf98d3e3fe8a6b9d508121492 (patch) | |
tree | fcf32f6231c7d17f853083f28e9e304e3f82e715 /include/sound/soc-dapm.h | |
parent | 3cd043436c2d5d6f8e9a5395d02ba966f0dfdf84 (diff) |
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: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'include/sound/soc-dapm.h')
-rw-r--r-- | include/sound/soc-dapm.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 64302384dea3..7562b8fb6974 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -324,6 +324,7 @@ struct snd_soc_dapm_path; | |||
324 | struct snd_soc_dapm_pin; | 324 | struct snd_soc_dapm_pin; |
325 | struct snd_soc_dapm_route; | 325 | struct snd_soc_dapm_route; |
326 | struct snd_soc_dapm_context; | 326 | struct snd_soc_dapm_context; |
327 | struct regulator; | ||
327 | 328 | ||
328 | int dapm_reg_event(struct snd_soc_dapm_widget *w, | 329 | int dapm_reg_event(struct snd_soc_dapm_widget *w, |
329 | struct snd_kcontrol *kcontrol, int event); | 330 | struct snd_kcontrol *kcontrol, int event); |
@@ -487,6 +488,7 @@ struct snd_soc_dapm_widget { | |||
487 | struct snd_soc_dapm_context *dapm; | 488 | struct snd_soc_dapm_context *dapm; |
488 | 489 | ||
489 | void *priv; /* widget specific data */ | 490 | void *priv; /* widget specific data */ |
491 | struct regulator *regulator; /* attached regulator */ | ||
490 | 492 | ||
491 | /* dapm control */ | 493 | /* dapm control */ |
492 | short reg; /* negative reg = no direct dapm */ | 494 | short reg; /* negative reg = no direct dapm */ |