diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-09 19:09:01 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2012-07-09 19:35:04 +0100 |
| commit | c9c56fd0b766f6f3cd19c83945954ff5b06afc5f (patch) | |
| tree | b8b3cff6f8cc89b12a443b242d578bd4cf0be1dd | |
| parent | a837987e7b36a9056cd17c0967efe1ce73a102ff (diff) | |
| download | linux-3.10-c9c56fd0b766f6f3cd19c83945954ff5b06afc5f.tar.gz linux-3.10-c9c56fd0b766f6f3cd19c83945954ff5b06afc5f.tar.bz2 linux-3.10-c9c56fd0b766f6f3cd19c83945954ff5b06afc5f.zip | |
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>
| -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 0be04b52658..f3680c37434 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] = { "IN2R", "IN3L", "IN3R", + "IN4L", + "IN4R", "AIF1RX1", "AIF1RX2", "AIF1RX3", @@ -138,6 +140,8 @@ int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = { 0x13, 0x14, 0x15, + 0x16, + 0x17, 0x20, /* AIF1RX1 */ 0x21, 0x22, diff --git a/sound/soc/codecs/arizona.h b/sound/soc/codecs/arizona.h index 896711e19ba..b894b64e8f5 100644 --- a/sound/soc/codecs/arizona.h +++ b/sound/soc/codecs/arizona.h @@ -59,7 +59,7 @@ struct arizona_priv { struct arizona_dai_priv dai[ARIZONA_MAX_DAI]; }; -#define ARIZONA_NUM_MIXER_INPUTS 55 +#define ARIZONA_NUM_MIXER_INPUTS 57 extern const unsigned int arizona_mixer_tlv[]; extern const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS]; |