From fed84b485130be1af4f735b320266300594ef94f Mon Sep 17 00:00:00 2001
From: Chris Rattray <crattray@opensource.wolfsonmicro.com>
Date: Fri, 1 Feb 2013 15:40:41 +0000
Subject: [PATCH] --- yaml --- r: 353455 b: refs/heads/master c:
 4c97e8fedf1a7ef52e23dc06ec7a15be54ed18a4 h: refs/heads/master i:   353453:
 c281081030802413e08fcfa2b70c0a3e4dfad200   353451:
 cd43d5142991073f4b5fd741c0030ca21be6af9f   353447:
 e473d94714e3446a4f38cc853a484301fe658c9a   353439:
 7e5b0bd7de1fe2b6e6a20bfcaefe047602a2762f v: v3

---
 [refs]                          |  2 +-
 trunk/sound/soc/codecs/wm2200.c | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 83596a452166..b5e6f83f29f8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0098389564fbdfbeb08181f772205d87a18f5b37
+refs/heads/master: 4c97e8fedf1a7ef52e23dc06ec7a15be54ed18a4
diff --git a/trunk/sound/soc/codecs/wm2200.c b/trunk/sound/soc/codecs/wm2200.c
index fc05553cc9c1..fee1a18e309e 100644
--- a/trunk/sound/soc/codecs/wm2200.c
+++ b/trunk/sound/soc/codecs/wm2200.c
@@ -1112,6 +1112,16 @@ static int wm2200_mixer_values[] = {
 	static WM2200_MUX_CTL_DECL(name##_aux5); \
 	static WM2200_MUX_CTL_DECL(name##_aux6);
 
+static const char *wm2200_rxanc_input_sel_texts[] = {
+	"None", "IN1", "IN2", "IN3",
+};
+
+static const struct soc_enum wm2200_rxanc_input_sel =
+	SOC_ENUM_SINGLE(WM2200_RXANC_SRC,
+			WM2200_IN_RXANC_SEL_SHIFT,
+			ARRAY_SIZE(wm2200_rxanc_input_sel_texts),
+			wm2200_rxanc_input_sel_texts);
+
 static const struct snd_kcontrol_new wm2200_snd_controls[] = {
 SOC_SINGLE("IN1 High Performance Switch", WM2200_IN1L_CONTROL,
 	   WM2200_IN1_OSR_SHIFT, 1, 0),
@@ -1171,6 +1181,7 @@ SOC_DOUBLE_R_TLV("OUT2 Digital Volume", WM2200_DAC_DIGITAL_VOLUME_2L,
 		 digital_tlv),
 SOC_DOUBLE("OUT2 Switch", WM2200_PDM_1, WM2200_SPK1L_MUTE_SHIFT,
 	   WM2200_SPK1R_MUTE_SHIFT, 1, 1),
+SOC_ENUM("RxANC Src", wm2200_rxanc_input_sel),
 };
 
 WM2200_MIXER_ENUMS(OUT1L, WM2200_OUT1LMIX_INPUT_1_SOURCE);