diff options
author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-09 14:09:01 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-09 14:35:04 -0400 |
commit | c9c56fd0b766f6f3cd19c83945954ff5b06afc5f (patch) | |
tree | b8b3cff6f8cc89b12a443b242d578bd4cf0be1dd /sound/soc/codecs | |
parent | a837987e7b36a9056cd17c0967efe1ce73a102ff (diff) |
ASoC: arizona: Add IN4 to the mixer tables
Some devices have four input structures rather than three.
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/codecs')
-rw-r--r-- | sound/soc/codecs/arizona.c | 4 | ||||
-rw-r--r-- | sound/soc/codecs/arizona.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/sound/soc/codecs/arizona.c b/sound/soc/codecs/arizona.c index 0be04b526588..f3680c374347 100644 --- a/sound/soc/codecs/arizona.c +++ b/sound/soc/codecs/arizona.c | |||
@@ -79,6 +79,8 @@ const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = { | |||
79 | "IN2R", | 79 | "IN2R", |
80 | "IN3L", | 80 | "IN3L", |
81 | "IN3R", | 81 | "IN3R", |
82 | "IN4L", | ||
83 | "IN4R", | ||
82 | "AIF1RX1", | 84 | "AIF1RX1", |
83 | "AIF1RX2", | 85 | "AIF1RX2", |
84 | "AIF1RX3", | 86 | "AIF1RX3", |
@@ -138,6 +140,8 @@ int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = { | |||
138 | 0x13, | 140 | 0x13, |
139 | 0x14, | 141 | 0x14, |
140 | 0x15, | 142 | 0x15, |
143 | 0x16, | ||
144 | 0x17, | ||
141 | 0x20, /* AIF1RX1 */ | 145 | 0x20, /* AIF1RX1 */ |
142 | 0x21, | 146 | 0x21, |
143 | 0x22, | 147 | 0x22, |
diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h index 896711e19baa..b894b64e8f5c 100644 --- a/sound/soc/codecs/arizona.h +++ b/sound/soc/codecs/arizona.h | |||
@@ -59,7 +59,7 @@ struct arizona_priv { | |||
59 | struct arizona_dai_priv dai[ARIZONA_MAX_DAI]; | 59 | struct arizona_dai_priv dai[ARIZONA_MAX_DAI]; |
60 | }; | 60 | }; |
61 | 61 | ||
62 | #define ARIZONA_NUM_MIXER_INPUTS 55 | 62 | #define ARIZONA_NUM_MIXER_INPUTS 57 |
63 | 63 | ||
64 | extern const unsigned int arizona_mixer_tlv[]; | 64 | extern const unsigned int arizona_mixer_tlv[]; |
65 | extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS]; | 65 | extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS]; |