From: Eric Miao Date: Thu, 26 Jul 2007 01:01:04 +0000 (+0100) Subject: [ARM] 4527/1: pxa: fix pxa27x ac97 cold reset in ASoC due to CKEN change X-Git-Tag: v2.6.23-rc2~182^2 X-Git-Url: http://git.samba.org/samba.git/?p=sfrench%2Fcifs-2.6.git;a=commitdiff_plain;h=0a9c2df263b2ef487e6b4015644cc18012d7411b;hp=03e5386e1e6e4f19c18c33fb69afd43054d448b2 [ARM] 4527/1: pxa: fix pxa27x ac97 cold reset in ASoC due to CKEN change due to CKEN_xxx definition and pxa_set_cken() change, the pxa27x ac97 cold reset is broken in ASoC, fixed to use bit index instead of bit mask Signed-off-by: eric miao Signed-off-by: Russell King --- diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index 129d851b3151..dd14abcdf1bd 100644 --- a/sound/soc/pxa/pxa2xx-ac97.c +++ b/sound/soc/pxa/pxa2xx-ac97.c @@ -160,9 +160,9 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97) gsr_bits = 0; #ifdef CONFIG_PXA27x /* PXA27x Developers Manual section 13.5.2.2.1 */ - pxa_set_cken(1 << 31, 1); + pxa_set_cken(31, 1); udelay(5); - pxa_set_cken(1 << 31, 0); + pxa_set_cken(31, 0); GCR = GCR_COLD_RST; udelay(50); #else