ASoC: arizona: Add IN4 to the mixer tables
authorMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 9 Jul 2012 18:09:01 +0000 (19:09 +0100)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 9 Jul 2012 18:35:04 +0000 (19:35 +0100)
Some devices have four input structures rather than three.

Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/codecs/arizona.c
sound/soc/codecs/arizona.h

index 0be04b52658887dc0fbdcc01f8ca26591dcce0b4..f3680c374347202a60aae3fc6d035af4250c41bd 100644 (file)
@@ -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,
index 896711e19baa19bc3f5579be8f43f139b52733d5..b894b64e8f5ca75bf1f32671b0364498cb67f19c 100644 (file)
@@ -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];