diff options
| author | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:44 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2016-12-12 15:52:44 +0000 |
| commit | c0f2302a6ac310bcacccafbefe414a8026375b60 (patch) | |
| tree | ac7e09e792cb5bf1b3f9e9aab47250e884ced2bb /include/sound | |
| parent | 3f1b86139e94289289b00f745cc483b1fef5fd46 (diff) | |
| parent | 02866eab0f0d88c4b6a68de72022c2b26f0359b5 (diff) | |
| download | linux-c0f2302a6ac310bcacccafbefe414a8026375b60.tar.gz linux-c0f2302a6ac310bcacccafbefe414a8026375b60.tar.bz2 linux-c0f2302a6ac310bcacccafbefe414a8026375b60.zip | |
Merge remote-tracking branch 'asoc/topic/dapm' into asoc-next
Diffstat (limited to 'include/sound')
| -rw-r--r-- | include/sound/soc-dapm.h | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index f60d755f7ac6..a466f4bdc835 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -272,6 +272,16 @@ struct device; /* dapm kcontrol types */ +#define SOC_DAPM_DOUBLE(xname, reg, lshift, rshift, max, invert) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = snd_soc_info_volsw, \ + .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ + .private_value = SOC_DOUBLE_VALUE(reg, lshift, rshift, max, invert, 0) } +#define SOC_DAPM_DOUBLE_R(xname, lreg, rreg, shift, max, invert) \ +{ .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ + .info = snd_soc_info_volsw, \ + .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ + .private_value = SOC_DOUBLE_R_VALUE(lreg, rreg, shift, max, invert) } #define SOC_DAPM_SINGLE(xname, reg, shift, max, invert) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_info_volsw, \ @@ -615,6 +625,10 @@ struct snd_soc_dapm_update { int reg; int mask; int val; + int reg2; + int mask2; + int val2; + bool has_second_set; }; struct snd_soc_dapm_wcache { |