|
From: <mar...@us...> - 2006-11-27 15:00:40
|
Revision: 682
http://svn.sourceforge.net/hackndev/?rev=682&view=rev
Author: marex_z71
Date: 2006-11-27 07:00:27 -0800 (Mon, 27 Nov 2006)
Log Message:
-----------
l4p: PalmTC sound fixes by bitz ... I guess we should give bitz svn
access ...
Modified Paths:
--------------
linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c
Modified: linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c
===================================================================
--- linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c 2006-11-23 12:57:32 UTC (rev 681)
+++ linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c 2006-11-27 15:00:27 UTC (rev 682)
@@ -191,6 +191,11 @@
status = GSR;
if (status) {
+#ifdef MACH_OMAP_PALMTC
+ if (status & GSR_GSCI) {
+ return IRQ_NONE;
+ }
+#endif
GSR = status;
gsr_bits |= status;
wake_up(&gsr_wq);
@@ -203,7 +208,6 @@
PISR = PISR_EOC;
MCSR = MCSR_EOC;
#endif
-
return IRQ_HANDLED;
}
@@ -357,8 +361,11 @@
ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm);
if (ret)
goto err;
-
+#ifdef MACH_OMAP_PALMTC
+ ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, SA_SHIRQ, "AC97", dev);
+#else
ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL);
+#endif
if (ret < 0)
goto err;
@@ -410,7 +417,11 @@
snd_card_free(card);
platform_set_drvdata(dev, NULL);
GCR |= GCR_ACLINK_OFF;
+#ifdef MACH_OMAP_PALMTC
+ free_irq(IRQ_AC97, dev);
+#else
free_irq(IRQ_AC97, NULL);
+#endif
pxa_set_cken(CKEN2_AC97, 0);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|