Merge branch 'origin' into devel-stable

[net-next-2.6.git] / arch / arm / mach-pxa / pxa27x.c

diff --git a/arch/arm/mach-pxa/pxa27x.c b/arch/arm/mach-pxa/pxa27x.c
index d783123e2d48e483917f88614dea852d74040504..0af36177ff085c92f34cd729bd5775f25d948a2f 100644 (file)
--- a/arch/arm/mach-pxa/pxa27x.c
+++ b/arch/arm/mach-pxa/pxa27x.c
@@ -40,6 +40,25 @@ void pxa27x_clear_otgph(void)
 }
 EXPORT_SYMBOL(pxa27x_clear_otgph);
 
+static unsigned long ac97_reset_config[] = {
+       GPIO95_AC97_nRESET,
+       GPIO95_GPIO,
+       GPIO113_AC97_nRESET,
+       GPIO113_GPIO,
+};
+
+void pxa27x_assert_ac97reset(int reset_gpio, int on)
+{
+       if (reset_gpio == 113)
+               pxa2xx_mfp_config(on ? &ac97_reset_config[0] :
+                                      &ac97_reset_config[1], 1);
+
+       if (reset_gpio == 95)
+               pxa2xx_mfp_config(on ? &ac97_reset_config[2] :
+                                      &ac97_reset_config[3], 1);
+}
+EXPORT_SYMBOL_GPL(pxa27x_assert_ac97reset);
+
 /* Crystal clock: 13MHz */
 #define BASE_CLK       13000000