diff options
author | Mark Brown <broonie@linaro.org> | 2013-11-08 11:43:40 +0100 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-11-08 11:43:40 +0100 |
commit | 88cb5111e8d658abde760605e63db4ecd4f67d82 (patch) | |
tree | 4b3b3815e95d4adeacf7d4107bcb665cb4dd6d33 /include | |
parent | Merge remote-tracking branch 'asoc/topic/tpa6130a2' into asoc-next (diff) | |
parent | ASoC: twl4030: Use virtual DAPM mixer controls (diff) | |
download | linux-88cb5111e8d658abde760605e63db4ecd4f67d82.tar.xz linux-88cb5111e8d658abde760605e63db4ecd4f67d82.zip |
Merge remote-tracking branch 'asoc/topic/twl4030' into asoc-next
Diffstat (limited to 'include')
-rw-r--r-- | include/sound/soc-dapm.h | 4 | ||||
-rw-r--r-- | include/sound/soc.h | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/include/sound/soc-dapm.h b/include/sound/soc-dapm.h index 27a72d5d4b00..2037c45adfe6 100644 --- a/include/sound/soc-dapm.h +++ b/include/sound/soc-dapm.h @@ -286,6 +286,8 @@ struct device; .info = snd_soc_info_volsw, \ .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 1) } +#define SOC_DAPM_SINGLE_VIRT(xname, max) \ + SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0) #define SOC_DAPM_SINGLE_TLV(xname, reg, shift, max, invert, tlv_array) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_info_volsw, \ @@ -300,6 +302,8 @@ struct device; .tlv.p = (tlv_array), \ .get = snd_soc_dapm_get_volsw, .put = snd_soc_dapm_put_volsw, \ .private_value = SOC_SINGLE_VALUE(reg, shift, max, invert, 0) } +#define SOC_DAPM_SINGLE_TLV_VIRT(xname, max, tlv_array) \ + SOC_DAPM_SINGLE(xname, SND_SOC_NOPM, 0, max, 0, tlv_array) #define SOC_DAPM_ENUM(xname, xenum) \ { .iface = SNDRV_CTL_ELEM_IFACE_MIXER, .name = xname, \ .info = snd_soc_info_enum_double, \ diff --git a/include/sound/soc.h b/include/sound/soc.h index fbea72f9cc66..1f741cb24f33 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1051,7 +1051,8 @@ struct snd_soc_pcm_runtime { /* mixer control */ struct soc_mixer_control { int min, max, platform_max; - unsigned int reg, rreg, shift, rshift; + int reg, rreg; + unsigned int shift, rshift; unsigned int invert:1; unsigned int autodisable:1; }; |