diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-24 20:44:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2009-08-24 20:44:41 +0100 |
| commit | e4aa8dd5cadca054a807278b04f67ce8e3b9dc42 (patch) | |
| tree | 8186e049749d630b0be359cd5310bbe44675fd92 /include/sound | |
| parent | 239a22aaa9d4d574d397b852652684ac610d1e1b (diff) | |
| parent | 59ae07a58012a96cfbc9b4c0f3a07ad07d2a2208 (diff) | |
| download | linux-stable-e4aa8dd5cadca054a807278b04f67ce8e3b9dc42.tar.gz linux-stable-e4aa8dd5cadca054a807278b04f67ce8e3b9dc42.tar.bz2 linux-stable-e4aa8dd5cadca054a807278b04f67ce8e3b9dc42.zip | |
Merge branch 'topic/digital-mixing' into for-2.6.32
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 1673f0b2cf58..c1410e3191e3 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -137,6 +137,12 @@ .event_flags = SND_SOC_DAPM_POST_PMU | SND_SOC_DAPM_POST_PMD} /* stream domain */ +#define SND_SOC_DAPM_AIF_IN(wname, stname, wslot, wreg, wshift, winvert) \ +{ .id = snd_soc_dapm_aif_in, .name = wname, .sname = stname, \ + .reg = wreg, .shift = wshift, .invert = winvert } +#define SND_SOC_DAPM_AIF_OUT(wname, stname, wslot, wreg, wshift, winvert) \ +{ .id = snd_soc_dapm_aif_out, .name = wname, .sname = stname, \ + .reg = wreg, .shift = wshift, .invert = winvert } #define SND_SOC_DAPM_DAC(wname, stname, wreg, wshift, winvert) \ { .id = snd_soc_dapm_dac, .name = wname, .sname = stname, .reg = wreg, \ .shift = wshift, .invert = winvert} @@ -313,6 +319,8 @@ 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_aif_in, /* audio interface input */ + snd_soc_dapm_aif_out, /* audio interface output */ }; /* |