diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-12-08 09:41:29 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-12-08 09:41:29 -0500 |
| commit | 1265edb8fd2869d17128f1d60683dd6f4191d550 (patch) | |
| tree | 795e037b9dcaf8fced9777673032f01fe5271667 /sound | |
| parent | 94545baded0bfbabdc30a3a4cb48b3db479dd6ef (diff) | |
| parent | 03d14a5536cf5611d27a106137a814c8f1135ddd (diff) | |
Merge branch 'pxa-fixes'
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/arm/pxa2xx-ac97.c | 4 | ||||
| -rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/sound/arm/pxa2xx-ac97.c b/sound/arm/pxa2xx-ac97.c index 7bc2767e1584..55c6c822bec1 100644 --- a/sound/arm/pxa2xx-ac97.c +++ b/sound/arm/pxa2xx-ac97.c | |||
| @@ -113,9 +113,9 @@ static void pxa2xx_ac97_reset(struct snd_ac97 *ac97) | |||
| 113 | gsr_bits = 0; | 113 | gsr_bits = 0; |
| 114 | #ifdef CONFIG_PXA27x | 114 | #ifdef CONFIG_PXA27x |
| 115 | /* PXA27x Developers Manual section 13.5.2.2.1 */ | 115 | /* PXA27x Developers Manual section 13.5.2.2.1 */ |
| 116 | pxa_set_cken(1 << 31, 1); | 116 | pxa_set_cken(CKEN_AC97CONF, 1); |
| 117 | udelay(5); | 117 | udelay(5); |
| 118 | pxa_set_cken(1 << 31, 0); | 118 | pxa_set_cken(CKEN_AC97CONF, 0); |
| 119 | GCR = GCR_COLD_RST; | 119 | GCR = GCR_COLD_RST; |
| 120 | udelay(50); | 120 | udelay(50); |
| 121 | #else | 121 | #else |
diff --git a/sound/soc/pxa/pxa2xx-ac97.c b/sound/soc/pxa/pxa2xx-ac97.c index dd14abcdf1bd..60e6f4677f93 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(31, 1); | 163 | pxa_set_cken(CKEN_AC97CONF, 1); |
| 164 | udelay(5); | 164 | udelay(5); |
| 165 | pxa_set_cken(31, 0); | 165 | pxa_set_cken(CKEN_AC97CONF, 0); |
| 166 | GCR = GCR_COLD_RST; | 166 | GCR = GCR_COLD_RST; |
| 167 | udelay(50); | 167 | udelay(50); |
| 168 | #else | 168 | #else |