3.0-stable patches

added patches:
	alsa-pxa27x-fix-ac97-cold-reset.patch
	asoc-wm2000-fix-sense-of-speech-clarity-enable.patch

diff --git a/queue-3.0/alsa-pxa27x-fix-ac97-cold-reset.patch b/queue-3.0/alsa-pxa27x-fix-ac97-cold-reset.patch
new file mode 100644 (file)
index 0000000..a38b136
--- /dev/null
+++ b/queue-3.0/alsa-pxa27x-fix-ac97-cold-reset.patch
@@ -0,0 +1,54 @@
+From 41b645c8624df6ace020a8863ad1449d69140f7d Mon Sep 17 00:00:00 2001
+From: Mike Dunn <mikedunn@newsguy.com>
+Date: Mon, 7 Jan 2013 13:55:12 -0800
+Subject: ALSA: pxa27x: fix ac97 cold reset
+
+From: Mike Dunn <mikedunn@newsguy.com>
+
+commit 41b645c8624df6ace020a8863ad1449d69140f7d upstream.
+
+Cold reset on the pxa27x currently fails and
+
+     pxa2xx_ac97_try_cold_reset: cold reset timeout (GSR=0x44)
+
+appears in the kernel log.  Through trial-and-error (the pxa270 developer's
+manual is mostly incoherent on the topic of ac97 reset), I got cold reset to
+complete by setting the WARM_RST bit in the GCR register (and later noticed that
+pxa3xx does this for cold reset as well).  Also, a timeout loop is needed to
+wait for the reset to complete.
+
+Tested on a palm treo 680 machine.
+
+Signed-off-by: Mike Dunn <mikedunn@newsguy.com>
+Acked-by: Igor Grinberg <grinberg@compulab.co.il>
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/arm/pxa2xx-ac97-lib.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+--- a/sound/arm/pxa2xx-ac97-lib.c
++++ b/sound/arm/pxa2xx-ac97-lib.c
+@@ -146,6 +146,8 @@ static inline void pxa_ac97_warm_pxa27x(
+ 
+ static inline void pxa_ac97_cold_pxa27x(void)
+ {
++      unsigned int timeout;
++
+       GCR &=  GCR_COLD_RST;  /* clear everything but nCRST */
+       GCR &= ~GCR_COLD_RST;  /* then assert nCRST */
+ 
+@@ -155,8 +157,10 @@ static inline void pxa_ac97_cold_pxa27x(
+       clk_enable(ac97conf_clk);
+       udelay(5);
+       clk_disable(ac97conf_clk);
+-      GCR = GCR_COLD_RST;
+-      udelay(50);
++      GCR = GCR_COLD_RST | GCR_WARM_RST;
++      timeout = 100;     /* wait for the codec-ready bit to be set */
++      while (!((GSR | gsr_bits) & (GSR_PCR | GSR_SCR)) && timeout--)
++              mdelay(1);
+ }
+ #endif
+ 

diff --git a/queue-3.0/asoc-wm2000-fix-sense-of-speech-clarity-enable.patch b/queue-3.0/asoc-wm2000-fix-sense-of-speech-clarity-enable.patch
new file mode 100644 (file)
index 0000000..9978439
--- /dev/null
+++ b/queue-3.0/asoc-wm2000-fix-sense-of-speech-clarity-enable.patch
@@ -0,0 +1,30 @@
+From 267f8fa2e1eef0612b2007e1f1846bcbc35cc1fa Mon Sep 17 00:00:00 2001
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Date: Fri, 4 Jan 2013 21:18:12 +0000
+Subject: ASoC: wm2000: Fix sense of speech clarity enable
+
+From: Mark Brown <broonie@opensource.wolfsonmicro.com>
+
+commit 267f8fa2e1eef0612b2007e1f1846bcbc35cc1fa upstream.
+
+Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/soc/codecs/wm2000.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/sound/soc/codecs/wm2000.c
++++ b/sound/soc/codecs/wm2000.c
+@@ -224,9 +224,9 @@ static int wm2000_power_up(struct i2c_cl
+ 
+       ret = wm2000_read(i2c, WM2000_REG_SPEECH_CLARITY);
+       if (wm2000->speech_clarity)
+-              ret &= ~WM2000_SPEECH_CLARITY;
+-      else
+               ret |= WM2000_SPEECH_CLARITY;
++      else
++              ret &= ~WM2000_SPEECH_CLARITY;
+       wm2000_write(i2c, WM2000_REG_SPEECH_CLARITY, ret);
+ 
+       wm2000_write(i2c, WM2000_REG_SYS_START0, 0x33);

diff --git a/queue-3.0/series b/queue-3.0/series
index 790ceed0575e41c324d7560ef1529d721444a0ba..55cf69aa519de56a3f80effc8fdf4b6b4a1fdbe5 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -44,3 +44,5 @@ rtnetlink-compute-and-store-minimum-ifinfo-dump-size.patch
 rtnetlink-fix-problem-with-buffer-allocation.patch
 rtnetlink-fix-rtnl_calcit-and-rtnl_dump_ifinfo.patch
 epoll-prevent-missed-events-on-epoll_ctl_mod.patch
+asoc-wm2000-fix-sense-of-speech-clarity-enable.patch
+alsa-pxa27x-fix-ac97-cold-reset.patch