From b74e1afbf4c37b312465ca1a90cac45652bffe1f Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Thu, 22 Sep 2011 11:05:54 +0300
Subject: [PATCH] --- yaml --- r: 270645 b: refs/heads/master c:
 ab6cf13943303f865320407b17b0f86095d23ce3 h: refs/heads/master i:   270643:
 b030b3516ba622c2da24cb26a2bf169a45e166df v: v3

---
 [refs]                            |  2 +-
 trunk/include/linux/mfd/twl6040.h | 11 +++--------
 trunk/sound/soc/codecs/twl6040.c  |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index b95d2d380ca8..976fdc852c35 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d13f1fe04412b2319a79ff456cf73cc59692f6fb
+refs/heads/master: ab6cf13943303f865320407b17b0f86095d23ce3
diff --git a/trunk/include/linux/mfd/twl6040.h b/trunk/include/linux/mfd/twl6040.h
index 47470cadf969..d9e05eabef33 100644
--- a/trunk/include/linux/mfd/twl6040.h
+++ b/trunk/include/linux/mfd/twl6040.h
@@ -120,15 +120,10 @@
 #define TWL6040_LPLLFIN			0x08
 #define TWL6040_HPLLSEL			0x10
 
-/* HSLCTL (0x10) fields */
+/* HSLCTL/R (0x10/0x11) fields */
 
-#define TWL6040_HSDACMODEL		0x02
-#define TWL6040_HSDRVMODEL		0x08
-
-/* HSRCTL (0x11) fields */
-
-#define TWL6040_HSDACMODER		0x02
-#define TWL6040_HSDRVMODER		0x08
+#define TWL6040_HSDACMODE		(1 << 1)
+#define TWL6040_HSDRVMODE		(1 << 3)
 
 /* VIBCTLL (0x18) fields */
 
diff --git a/trunk/sound/soc/codecs/twl6040.c b/trunk/sound/soc/codecs/twl6040.c
index 760701e89fa7..68e52c9282a5 100644
--- a/trunk/sound/soc/codecs/twl6040.c
+++ b/trunk/sound/soc/codecs/twl6040.c
@@ -642,7 +642,7 @@ static int pga_event(struct snd_soc_dapm_widget *w,
 static int headset_power_mode(struct snd_soc_codec *codec, int high_perf)
 {
 	int hslctl, hsrctl;
-	int mask = TWL6040_HSDRVMODEL | TWL6040_HSDACMODEL;
+	int mask = TWL6040_HSDRVMODE | TWL6040_HSDACMODE;
 
 	hslctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSLCTL);
 	hsrctl = twl6040_read_reg_cache(codec, TWL6040_REG_HSRCTL);