[ARM] 4690/1: PXA: fix CKEN corruption in PXA27x AC97 cold reset code

Fix CKEN register corruption in the PXA27x cold reset code
located in sound/arm/pxa27x-ac97.c. The problem has been
introduced with a pxa_set_cken() function change in linux 2.6.23.
This patch is based on patch 4527/1 that fixes the same problem in
the ASoC PXA-AC97 driver. Additionally a definition for the CKEN
index value is added and applied to both PXA AC97 drivers.

Signed-off-by: Michael Brunner <mibru@gmx.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

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)
         gsr_bits = 0;
 #ifdef CONFIG_PXA27x
         /* PXA27x Developers Manual section 13.5.2.2.1 */
-        pxa_set_cken(1 << 31, 1);
+        pxa_set_cken(CKEN_AC97CONF, 1);
         udelay(5);
-        pxa_set_cken(1 << 31, 0);
+        pxa_set_cken(CKEN_AC97CONF, 0);
         GCR = GCR_COLD_RST;
         udelay(50);
 #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)
         gsr_bits = 0;
 #ifdef CONFIG_PXA27x
         /* PXA27x Developers Manual section 13.5.2.2.1 */
-        pxa_set_cken(31, 1);
+        pxa_set_cken(CKEN_AC97CONF, 1);
         udelay(5);
-        pxa_set_cken(31, 0);
+        pxa_set_cken(CKEN_AC97CONF, 0);
         GCR = GCR_COLD_RST;
         udelay(50);
 #else