summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorMike Dunn <mikedunn@newsguy.com>2013-01-07 13:55:12 -0800
committerMark Brown <broonie@opensource.wolfsonmicro.com>2013-01-08 11:27:27 +0000
commit41b645c8624df6ace020a8863ad1449d69140f7d (patch)
tree701bedcdd8922cf72ecac2e4029374c306f7bcdd /sound
parentd1c3ed669a2d452cacfb48c2d171a1f364dae2ed (diff)
downloadlinux-stable-41b645c8624df6ace020a8863ad1449d69140f7d.tar.gz
linux-stable-41b645c8624df6ace020a8863ad1449d69140f7d.tar.bz2
linux-stable-41b645c8624df6ace020a8863ad1449d69140f7d.zip
ALSA: pxa27x: fix ac97 cold reset
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> Cc: stable@vger.kernel.org
Diffstat (limited to 'sound')
-rw-r--r--sound/arm/pxa2xx-ac97-lib.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/sound/arm/pxa2xx-ac97-lib.c b/sound/arm/pxa2xx-ac97-lib.c
index 6fc0ae90e5b1..1ecd0a66ecd3 100644
--- a/sound/arm/pxa2xx-ac97-lib.c
+++ b/sound/arm/pxa2xx-ac97-lib.c
@@ -148,6 +148,8 @@ static inline void pxa_ac97_warm_pxa27x(void)
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 */
@@ -157,8 +159,10 @@ static inline void pxa_ac97_cold_pxa27x(void)
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