From 434d5de31b6f572994d515cf0d5f433bec5872c6 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Mon, 9 Jul 2012 19:09:01 +0100
Subject: [PATCH] --- yaml --- r: 316306 b: refs/heads/master c:
 c9c56fd0b766f6f3cd19c83945954ff5b06afc5f h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/sound/soc/codecs/arizona.c | 4 ++++
 trunk/sound/soc/codecs/arizona.h | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 7692b8095dec..e036b8d40cfb 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a837987e7b36a9056cd17c0967efe1ce73a102ff
+refs/heads/master: c9c56fd0b766f6f3cd19c83945954ff5b06afc5f
diff --git a/trunk/sound/soc/codecs/arizona.c b/trunk/sound/soc/codecs/arizona.c
index 0be04b526588..f3680c374347 100644
--- a/trunk/sound/soc/codecs/arizona.c
+++ b/trunk/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/trunk/sound/soc/codecs/arizona.h b/trunk/sound/soc/codecs/arizona.h
index 896711e19baa..b894b64e8f5c 100644
--- a/trunk/sound/soc/codecs/arizona.h
+++ b/trunk/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];