Menu
▾
▴
hackndev-commit
|
From: <cri...@us...> - 2006-10-19 05:44:31
|
Revision: 635
http://svn.sourceforge.net/hackndev/?rev=635&view=rev
Author: cristianop
Date: 2006-10-18 22:44:21 -0700 (Wed, 18 Oct 2006)
Log Message:
-----------
palmtx: re-applying pxa2xx-ac97 reg 0x54 patch
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-10-19 05:29:19 UTC (rev 634)
+++ linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c 2006-10-19 05:44:21 UTC (rev 635)
@@ -115,11 +115,22 @@
GSR = GSR_CDONE | GSR_SDONE;
gsr_bits = 0;
*reg_addr = val;
+//#ifdef CONFIG_PXA27x
+#ifdef CONFIG_MACH_PALMTX
+ // recommended procedure for reg 0x54 (see PXA27x Specification Update: 28007109.pdf sec.: E54)
+ if (reg == AC97_GPIO_STATUS){
+ udelay(50);
+ }
+ else {
+#endif
if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1) <= 0 &&
!((GSR | gsr_bits) & GSR_CDONE))
printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n",
__FUNCTION__, reg, GSR | gsr_bits);
-
+//#ifdef CONFIG_PXA27x
+#ifdef CONFIG_MACH_PALMTX
+ }
+#endif
mutex_unlock(&car_mutex);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <bob...@us...> - 2006-11-17 08:18:11
|
Revision: 675
http://svn.sourceforge.net/hackndev/?rev=675&view=rev
Author: bobofdoom
Date: 2006-11-17 00:18:03 -0800 (Fri, 17 Nov 2006)
Log Message:
-----------
l4p: Applying pxa2xx-ac97 errata fix E54 to all pxa27x devices and some minor cosmetic changes.
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-16 21:29:19 UTC (rev 674)
+++ linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c 2006-11-17 08:18:03 UTC (rev 675)
@@ -63,30 +63,32 @@
gsr_bits = 0;
val = *reg_addr;
-// cris: dunno if it will work with all PXA27x so it's active only for the TX
-//#ifdef CONFIG_PXA27x
-#ifdef CONFIG_MACH_PALMTX
- // recommended procedure for reg 0x54 (see PXA27x Specification Update: 28007109.pdf sec.: E54)
- if (reg == AC97_GPIO_STATUS){
- if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1) <= 0 &&
- !((GSR | gsr_bits) & GSR_CDONE)) {
- printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n",
- __FUNCTION__, reg, GSR | gsr_bits);
+#ifdef CONFIG_PXA27x
+ /* recommended procedure for reg 0x54
+ (see PXA27x Specification Update: 28007109.pdf sec.: E54) */
+ if (reg == AC97_GPIO_STATUS)
+ {
+ if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE,
+ 1) <= 0 && !((GSR | gsr_bits) & GSR_CDONE)) {
+ printk(KERN_ERR "%s: read error (ac97_reg=%d "
+ "GSR=%#lx)\n", __FUNCTION__,
+ reg, GSR | gsr_bits);
val = -1;
goto out;
}
GSR = GSR_CDONE | GSR_SDONE;
-
}
- else {
+ else
#else
- if (reg == AC97_GPIO_STATUS)
+ if (reg == AC97_GPIO_STATUS)
goto out;
#endif
- if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1) <= 0 &&
- !((GSR | gsr_bits) & GSR_SDONE)) {
+
+ if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_SDONE, 1) <= 0
+ && !((GSR | gsr_bits) & GSR_SDONE))
+ {
printk(KERN_ERR "%s: read error (ac97_reg=%d GSR=%#lx)\n",
- __FUNCTION__, reg, GSR | gsr_bits);
+ __FUNCTION__, reg, GSR | gsr_bits);
val = -1;
goto out;
}
@@ -115,20 +117,21 @@
GSR = GSR_CDONE | GSR_SDONE;
gsr_bits = 0;
*reg_addr = val;
-//#ifdef CONFIG_PXA27x
-#ifdef CONFIG_MACH_PALMTX
- // recommended procedure for reg 0x54 (see PXA27x Specification Update: 28007109.pdf sec.: E54)
- if (reg == AC97_GPIO_STATUS){
+
+#ifdef CONFIG_PXA27x
+ /* recommended procedure for reg 0x54
+ (see PXA27x Specification Update: 28007109.pdf sec.: E54) */
+ if (reg == AC97_GPIO_STATUS) {
udelay(50);
- }
- else {
+ } else {
#endif
- if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE, 1) <= 0 &&
- !((GSR | gsr_bits) & GSR_CDONE))
- printk(KERN_ERR "%s: write error (ac97_reg=%d GSR=%#lx)\n",
- __FUNCTION__, reg, GSR | gsr_bits);
-//#ifdef CONFIG_PXA27x
-#ifdef CONFIG_MACH_PALMTX
+ if (wait_event_timeout(gsr_wq, (GSR | gsr_bits) & GSR_CDONE,
+ 1) <= 0 && !((GSR | gsr_bits) & GSR_CDONE)) {
+ printk(KERN_ERR "%s: write error (ac97_reg=%d "
+ "GSR=%#lx)\n", __FUNCTION__,
+ reg, GSR | gsr_bits);
+ }
+#ifdef CONFIG_PXA27x
}
#endif
mutex_unlock(&car_mutex);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
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.
|
|
From: <hol...@us...> - 2006-12-19 09:02:16
|
Revision: 711
http://svn.sourceforge.net/hackndev/?rev=711&view=rev
Author: holger_bocklet
Date: 2006-12-19 01:01:48 -0800 (Tue, 19 Dec 2006)
Log Message:
-----------
corrected ifdefs for palmtc in pxa-ac97
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-12-09 11:51:06 UTC (rev 710)
+++ linux4palm/linux/trunk/sound/arm/pxa2xx-ac97.c 2006-12-19 09:01:48 UTC (rev 711)
@@ -191,7 +191,7 @@
status = GSR;
if (status) {
-#ifdef MACH_OMAP_PALMTC
+#ifdef CONFIG_MACH_OMAP_PALMTC
if (status & GSR_GSCI) {
return IRQ_NONE;
}
@@ -361,8 +361,9 @@
ret = pxa2xx_pcm_new(card, &pxa2xx_ac97_pcm_client, &pxa2xx_ac97_pcm);
if (ret)
goto err;
-#ifdef MACH_OMAP_PALMTC
+#ifdef CONFIG_MACH_OMAP_PALMTC
ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, SA_SHIRQ, "AC97", dev);
+ printk("pxa-ac97: shared irq enabled");
#else
ret = request_irq(IRQ_AC97, pxa2xx_ac97_irq, 0, "AC97", NULL);
#endif
@@ -417,7 +418,7 @@
snd_card_free(card);
platform_set_drvdata(dev, NULL);
GCR |= GCR_ACLINK_OFF;
-#ifdef MACH_OMAP_PALMTC
+#ifdef CONFIG_MACH_OMAP_PALMTC
free_irq(IRQ_AC97, dev);
#else
free_irq(IRQ_AC97, NULL);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X