aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.wolfsonmicro.com>2015-09-28 09:01:08 -0400
committerMark Brown <broonie@kernel.org>2015-10-02 12:51:33 -0400
commit50e6168f27fdc1f915d3341743b46147c626dc6e (patch)
tree4d8b1269f021340a068cd7466046d83bf13c3076
parentccaadda319ffa42385d8eabde0efc3c544bebce3 (diff)
ASoC: arizona: add defines for single-input gain control
Adds convenience defines for declaring a gain control that has an input mux. These blocks are functionally equivalent to the existing mixer blocks but can only have a single input active at once. Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com> Acked-by: Mark Brown <broonie@kernel.org> Signed-off-by: Mark Brown <broonie@kernel.org>
-rw-r--r--sound/soc/codecs/arizona.h5
1 files changed, 5 insertions, 0 deletions
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h
index 7b68d05a0939..b73920ab8650 100644
--- a/sound/soc/codecs/arizona.h
+++ b/sound/soc/codecs/arizona.h
@@ -99,6 +99,11 @@ extern const unsigned int arizona_mixer_tlv[];
99extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS]; 99extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS];
100extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS]; 100extern int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS];
101 101
102#define ARIZONA_GAINMUX_CONTROLS(name, base) \
103 SOC_SINGLE_RANGE_TLV(name " Input Volume", base + 1, \
104 ARIZONA_MIXER_VOL_SHIFT, 0x20, 0x50, 0, \
105 arizona_mixer_tlv)
106
102#define ARIZONA_MIXER_CONTROLS(name, base) \ 107#define ARIZONA_MIXER_CONTROLS(name, base) \
103 SOC_SINGLE_RANGE_TLV(name " Input 1 Volume", base + 1, \ 108 SOC_SINGLE_RANGE_TLV(name " Input 1 Volume", base + 1, \
104 ARIZONA_MIXER_VOL_SHIFT, 0x20, 0x50, 0, \ 109 ARIZONA_MIXER_VOL_SHIFT, 0x20, 0x50, 0, \