diff options
author | Eric Miao <eric.y.miao@gmail.com> | 2007-07-25 21:01:04 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-07-28 15:53:25 -0400 |
commit | 0a9c2df263b2ef487e6b4015644cc18012d7411b (patch) | |
tree | ba2e81a4c4e986daa360b6df53a24a2cf476a846 /sound/soc | |
parent | 03e5386e1e6e4f19c18c33fb69afd43054d448b2 (diff) |
[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 <eric.y.miao@gmail.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'sound/soc')
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 4 |
1 files changed, 2 insertions, 2 deletions
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) | |||
160 | gsr_bits = 0; | 160 | gsr_bits = 0; |
161 | #ifdef CONFIG_PXA27x | 161 | #ifdef CONFIG_PXA27x |
162 | /* PXA27x Developers Manual section 13.5.2.2.1 */ | 162 | /* PXA27x Developers Manual section 13.5.2.2.1 */ |
163 | pxa_set_cken(1 << 31, 1); | 163 | pxa_set_cken(31, 1); |
164 | udelay(5); | 164 | udelay(5); |
165 | pxa_set_cken(1 << 31, 0); | 165 | pxa_set_cken(31, 0); |
166 | GCR = GCR_COLD_RST; | 166 | GCR = GCR_COLD_RST; |
167 | udelay(50); | 167 | udelay(50); |
168 | #else | 168 | #else |