git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
arch
/
mips
/
pci
/
fixup-cobalt.c
diff --git
a/arch/mips/pci/fixup-cobalt.c
b/arch/mips/pci/fixup-cobalt.c
index
75a01e7
..
7d5f6bb
100644
(file)
--- a/
arch/mips/pci/fixup-cobalt.c
+++ b/
arch/mips/pci/fixup-cobalt.c
@@
-94,22
+94,21
@@
static void qube_raq_galileo_fixup(struct pci_dev *dev)
#if 0
if (galileo_id >= 0x10) {
/* New Galileo, assumes PCI stop line to VIA is connected. */
#if 0
if (galileo_id >= 0x10) {
/* New Galileo, assumes PCI stop line to VIA is connected. */
- G
ALILEO_OUTL(0x4020, GT_PCI0_TOR_OFS
);
+ G
T_WRITE(GT_PCI0_TOR_OFS, 0x4020
);
} else if (galileo_id == 0x1 || galileo_id == 0x2)
#endif
{
signed int timeo;
/* XXX WE MUST DO THIS ELSE GALILEO LOCKS UP! -DaveM */
} else if (galileo_id == 0x1 || galileo_id == 0x2)
#endif
{
signed int timeo;
/* XXX WE MUST DO THIS ELSE GALILEO LOCKS UP! -DaveM */
- timeo = G
ALILEO_INL
(GT_PCI0_TOR_OFS);
+ timeo = G
T_READ
(GT_PCI0_TOR_OFS);
/* Old Galileo, assumes PCI STOP line to VIA is disconnected. */
/* Old Galileo, assumes PCI STOP line to VIA is disconnected. */
- G
ALILEO_OUTL(
+ G
T_WRITE(GT_PCI0_TOR_OFS,
(0xff << 16) | /* retry count */
(0xff << 8) | /* timeout 1 */
(0xff << 16) | /* retry count */
(0xff << 8) | /* timeout 1 */
- 0xff, /* timeout 0 */
- GT_PCI0_TOR_OFS);
+ 0xff); /* timeout 0 */
/* enable PCI retry exceeded interrupt */
/* enable PCI retry exceeded interrupt */
- G
ALILEO_OUTL(GALILEO_INTR_RETRY_CTR | GALILEO_INL(GT_INTRMASK_OFS), GT_INTRMASK_OFS
);
+ G
T_WRITE(GT_INTRMASK_OFS, GT_INTR_RETRYCTR0_MSK | GT_READ(GT_INTRMASK_OFS)
);
}
}
}
}