---

yaml --- r: 316306 b: refs/heads/master c: c9c56fd h: refs/heads/master v: v3
git-mirror · Jul 9, 2012 · 434d5de · 434d5de
1 parent 92fe3b7
commit 434d5de
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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];
-Original file line number
+Diff line change
@@ Expand Up / @@ -79,6 +79,8 @@ const char *arizona_mixer_texts[ARIZONA_NUM_MIXER_INPUTS] = { @@
     	"IN2R",
     	"IN3L",
     	"IN3R",
+    	"IN4L",
+    	"IN4R",
     	"AIF1RX1",
     	"AIF1RX2",
     	"AIF1RX3",
@@ Expand Down Expand Up / @@ -138,6 +140,8 @@ int arizona_mixer_values[ARIZONA_NUM_MIXER_INPUTS] = { @@
 x13,
 x14,
 x15,
+x16,
+x17,
 x20,  /* AIF1RX1 */
 x21,
 x22,
@@ Expand Down @@