diff options
Diffstat (limited to 'include/sound')
-rw-r--r-- | include/sound/soc-dapm.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 839a97b63269..533f9f256496 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h | |||
@@ -154,12 +154,16 @@ | |||
154 | .shift = wshift, .invert = winvert, \ | 154 | .shift = wshift, .invert = winvert, \ |
155 | .event = wevent, .event_flags = wflags} | 155 | .event = wevent, .event_flags = wflags} |
156 | 156 | ||
157 | /* generic register modifier widget */ | 157 | /* generic widgets */ |
158 | #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \ | 158 | #define SND_SOC_DAPM_REG(wid, wname, wreg, wshift, wmask, won_val, woff_val) \ |
159 | { .id = wid, .name = wname, .kcontrols = NULL, .num_kcontrols = 0, \ | 159 | { .id = wid, .name = wname, .kcontrols = NULL, .num_kcontrols = 0, \ |
160 | .reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \ | 160 | .reg = -((wreg) + 1), .shift = wshift, .mask = wmask, \ |
161 | .on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \ | 161 | .on_val = won_val, .off_val = woff_val, .event = dapm_reg_event, \ |
162 | .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD} | 162 | .event_flags = SND_SOC_DAPM_PRE_PMU | SND_SOC_DAPM_POST_PMD} |
163 | #define SND_SOC_DAPM_SUPPLY(wname, wreg, wshift, winvert, wevent, wflags) \ | ||
164 | { .id = snd_soc_dapm_supply, .name = wname, .reg = wreg, \ | ||
165 | .shift = wshift, .invert = winvert, .event = wevent, \ | ||
166 | .event_flags = wflags} | ||
163 | 167 | ||
164 | /* dapm kcontrol types */ | 168 | /* dapm kcontrol types */ |
165 | #define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \ | 169 | #define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \ |
@@ -308,6 +312,7 @@ enum snd_soc_dapm_type { | |||
308 | snd_soc_dapm_vmid, /* codec bias/vmid - to minimise pops */ | 312 | snd_soc_dapm_vmid, /* codec bias/vmid - to minimise pops */ |
309 | snd_soc_dapm_pre, /* machine specific pre widget - exec first */ | 313 | snd_soc_dapm_pre, /* machine specific pre widget - exec first */ |
310 | snd_soc_dapm_post, /* machine specific post widget - exec last */ | 314 | snd_soc_dapm_post, /* machine specific post widget - exec last */ |
315 | snd_soc_dapm_supply, /* power/clock supply */ | ||
311 | }; | 316 | }; |
312 | 317 | ||
313 | /* | 318 | /* |