From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 12 May 2011 20:17:33 +0000 (-0700)
Subject: .38 patches
X-Git-Tag: v2.6.38.7~9
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fc5cd31632f9043ad674038820ee34c3592021fb;p=thirdparty%2Fkernel%2Fstable-queue.git

.38 patches
---

diff --git a/queue-2.6.38/asoc-ssm2602-fix-mic-boost2-control.patch b/queue-2.6.38/asoc-ssm2602-fix-mic-boost2-control.patch
new file mode 100644
index 00000000000..d9a631e7934
--- /dev/null
+++ b/queue-2.6.38/asoc-ssm2602-fix-mic-boost2-control.patch
@@ -0,0 +1,31 @@
+From 36c90ab33feabbd63da775bd92ad356e5bd5cf56 Mon Sep 17 00:00:00 2001
+From: Lars-Peter Clausen <lars@metafoo.de>
+Date: Thu, 5 May 2011 16:59:16 +0200
+Subject: ASoC: SSM2602: Fix 'Mic Boost2' control
+
+From: Lars-Peter Clausen <lars@metafoo.de>
+
+commit 36c90ab33feabbd63da775bd92ad356e5bd5cf56 upstream.
+
+The 'Mic Boost2' control's shift was off by one and thus was not working.
+
+Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
+Acked-by: Liam Girdwood <lrg@ti.com>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/soc/codecs/ssm2602.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/soc/codecs/ssm2602.c
++++ b/sound/soc/codecs/ssm2602.c
+@@ -139,7 +139,7 @@ SOC_DOUBLE_R("Capture Volume", SSM2602_L
+ SOC_DOUBLE_R("Capture Switch", SSM2602_LINVOL, SSM2602_RINVOL, 7, 1, 1),
+ 
+ SOC_SINGLE("Mic Boost (+20dB)", SSM2602_APANA, 0, 1, 0),
+-SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 7, 1, 0),
++SOC_SINGLE("Mic Boost2 (+20dB)", SSM2602_APANA, 8, 1, 0),
+ SOC_SINGLE("Mic Switch", SSM2602_APANA, 1, 1, 1),
+ 
+ SOC_SINGLE("Sidetone Playback Volume", SSM2602_APANA, 6, 3, 1),
diff --git a/queue-2.6.38/asoc-uda134x-remove-power_off_on_standby-define.patch b/queue-2.6.38/asoc-uda134x-remove-power_off_on_standby-define.patch
new file mode 100644
index 00000000000..cb260a4a9f8
--- /dev/null
+++ b/queue-2.6.38/asoc-uda134x-remove-power_off_on_standby-define.patch
@@ -0,0 +1,36 @@
+From bf707de21fec7bb203dace2d0a2bbd124d1b36ca Mon Sep 17 00:00:00 2001
+From: Marek Belisko <marek.belisko@open-nandra.com>
+Date: Tue, 3 May 2011 14:46:32 +0200
+Subject: ASoC: UDA134x: Remove POWER_OFF_ON_STANDBY define.
+
+From: Marek Belisko <marek.belisko@open-nandra.com>
+
+commit bf707de21fec7bb203dace2d0a2bbd124d1b36ca upstream.
+
+Define POWER_OFF_ON_STANDBY cause trobles when trying to get some
+sound from codec because code for bias setup was not compiled
+(define wasn't defined). This define was removed in commit:
+cc3202f5 but again introduced by commit: f0fba2ad1 which then
+completely break codec functionality so remove it again.
+
+Signed-off-by: Marek Belisko <marek.belisko@open-nandra.com>
+Acked-by: Liam Girdwood <lrg@ti.com>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ sound/soc/codecs/uda134x.c |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/sound/soc/codecs/uda134x.c
++++ b/sound/soc/codecs/uda134x.c
+@@ -601,9 +601,7 @@ static struct snd_soc_codec_driver soc_c
+ 	.reg_cache_step = 1,
+ 	.read = uda134x_read_reg_cache,
+ 	.write = uda134x_write,
+-#ifdef POWER_OFF_ON_STANDBY
+ 	.set_bias_level = uda134x_set_bias_level,
+-#endif
+ };
+ 
+ static int __devinit uda134x_codec_probe(struct platform_device *pdev)
diff --git a/queue-2.6.38/series b/queue-2.6.38/series
index f8f2f218bb5..c2beec0659c 100644
--- a/queue-2.6.38/series
+++ b/queue-2.6.38/series
@@ -36,3 +36,5 @@ pch_gbe-fixed-the-issue-of-checksum-judgment.patch
 pch_gbe-support-ml7223-ioh.patch
 net-dev_close-should-check-iff_up.patch
 slcan-fix-ldisc-open-retval.patch
+asoc-uda134x-remove-power_off_on_standby-define.patch
+asoc-ssm2602-fix-mic-boost2-control.patch