From abef1905cc913baeb10100ad93e4a45e097dd91f Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 23 Sep 2011 16:22:48 +0100
Subject: [PATCH] --- yaml --- r: 270659 b: refs/heads/master c:
 086d7f804e269454b4fffe757ed5517c3703baf8 h: refs/heads/master i:   270657:
 3cccd5a7043cd16d1747f5053d036b6b2881645a   270655:
 0da7848df50f80fc34c9991adf7ed576792032bf v: v3

---
 [refs]                                    |  2 +-
 trunk/sound/soc/codecs/wm8962.c           |  2 +-
 trunk/sound/soc/samsung/speyside_wm8962.c | 10 +++++-----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 6a65104d50c0..2698534312c7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3f7d55a19adbf37b5b91eea91b21f2209a1b9ca2
+refs/heads/master: 086d7f804e269454b4fffe757ed5517c3703baf8
diff --git a/trunk/sound/soc/codecs/wm8962.c b/trunk/sound/soc/codecs/wm8962.c
index d26ec6daec03..bc6bdde3019f 100644
--- a/trunk/sound/soc/codecs/wm8962.c
+++ b/trunk/sound/soc/codecs/wm8962.c
@@ -2667,7 +2667,7 @@ SND_SOC_DAPM_INPUT("IN4R"),
 SND_SOC_DAPM_INPUT("Beep"),
 SND_SOC_DAPM_INPUT("DMICDAT"),
 
-SND_SOC_DAPM_MICBIAS("MICBIAS", WM8962_PWR_MGMT_1, 1, 0),
+SND_SOC_DAPM_SUPPLY("MICBIAS", WM8962_PWR_MGMT_1, 1, 0, NULL, 0),
 
 SND_SOC_DAPM_SUPPLY("Class G", WM8962_CHARGE_PUMP_B, 0, 1, NULL, 0),
 SND_SOC_DAPM_SUPPLY("SYSCLK", WM8962_CLOCKING2, 5, 0, sysclk_event,
diff --git a/trunk/sound/soc/samsung/speyside_wm8962.c b/trunk/sound/soc/samsung/speyside_wm8962.c
index 98b28eac4120..35539eb8fa09 100644
--- a/trunk/sound/soc/samsung/speyside_wm8962.c
+++ b/trunk/sound/soc/samsung/speyside_wm8962.c
@@ -152,12 +152,12 @@ static struct snd_soc_dapm_route audio_paths[] = {
 	{ "Main Speaker", NULL, "SPKOUTL" },
 	{ "Main Speaker", NULL, "SPKOUTR" },
 
-	{ "MICBIAS", NULL, "Headset Mic" },
-	{ "IN4L", NULL, "MICBIAS" },
-	{ "IN4R", NULL, "MICBIAS" },
+	{ "Headset Mic", NULL, "MICBIAS" },
+	{ "IN4L", NULL, "Headset Mic" },
+	{ "IN4R", NULL, "Headset Mic" },
 
-	{ "MICBIAS", NULL, "DMIC" },
-	{ "DMICDAT", NULL, "MICBIAS" },
+	{ "DMIC", NULL, "MICBIAS" },
+	{ "DMICDAT", NULL, "DMIC" },
 };
 
 static struct snd_soc_jack speyside_wm8962_headset;