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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
mips
/
pci
/
ops-gt64111.c
diff --git
a/arch/mips/pci/ops-gt64111.c
b/arch/mips/pci/ops-gt64111.c
index
13de459
..
ecd3991
100644
(file)
--- a/
arch/mips/pci/ops-gt64111.c
+++ b/
arch/mips/pci/ops-gt64111.c
@@
-38,18
+38,18
@@
static int gt64111_pci_read_config(struct pci_bus *bus, unsigned int devfn,
switch (size) {
case 4:
PCI_CFG_SET(devfn, where);
switch (size) {
case 4:
PCI_CFG_SET(devfn, where);
- *val = G
ALILEO_INL
(GT_PCI0_CFGDATA_OFS);
+ *val = G
T_READ
(GT_PCI0_CFGDATA_OFS);
return PCIBIOS_SUCCESSFUL;
case 2:
PCI_CFG_SET(devfn, (where & ~0x3));
return PCIBIOS_SUCCESSFUL;
case 2:
PCI_CFG_SET(devfn, (where & ~0x3));
- *val = G
ALILEO_INL
(GT_PCI0_CFGDATA_OFS)
+ *val = G
T_READ
(GT_PCI0_CFGDATA_OFS)
>> ((where & 3) * 8);
return PCIBIOS_SUCCESSFUL;
case 1:
PCI_CFG_SET(devfn, (where & ~0x3));
>> ((where & 3) * 8);
return PCIBIOS_SUCCESSFUL;
case 1:
PCI_CFG_SET(devfn, (where & ~0x3));
- *val = G
ALILEO_INL
(GT_PCI0_CFGDATA_OFS)
+ *val = G
T_READ
(GT_PCI0_CFGDATA_OFS)
>> ((where & 3) * 8);
return PCIBIOS_SUCCESSFUL;
}
>> ((where & 3) * 8);
return PCIBIOS_SUCCESSFUL;
}
@@
-68,25
+68,25
@@
static int gt64111_pci_write_config(struct pci_bus *bus, unsigned int devfn,
switch (size) {
case 4:
PCI_CFG_SET(devfn, where);
switch (size) {
case 4:
PCI_CFG_SET(devfn, where);
- G
ALILEO_OUTL(val, GT_PCI0_CFGDATA_OFS
);
+ G
T_WRITE(GT_PCI0_CFGDATA_OFS, val
);
return PCIBIOS_SUCCESSFUL;
case 2:
PCI_CFG_SET(devfn, (where & ~0x3));
return PCIBIOS_SUCCESSFUL;
case 2:
PCI_CFG_SET(devfn, (where & ~0x3));
- tmp = G
ALILEO_INL
(GT_PCI0_CFGDATA_OFS);
+ tmp = G
T_READ
(GT_PCI0_CFGDATA_OFS);
tmp &= ~(0xffff << ((where & 0x3) * 8));
tmp |= (val << ((where & 0x3) * 8));
tmp &= ~(0xffff << ((where & 0x3) * 8));
tmp |= (val << ((where & 0x3) * 8));
- G
ALILEO_OUTL(tmp, GT_PCI0_CFGDATA_OFS
);
+ G
T_WRITE(GT_PCI0_CFGDATA_OFS, tmp
);
return PCIBIOS_SUCCESSFUL;
case 1:
PCI_CFG_SET(devfn, (where & ~0x3));
return PCIBIOS_SUCCESSFUL;
case 1:
PCI_CFG_SET(devfn, (where & ~0x3));
- tmp = G
ALILEO_INL
(GT_PCI0_CFGDATA_OFS);
+ tmp = G
T_READ
(GT_PCI0_CFGDATA_OFS);
tmp &= ~(0xff << ((where & 0x3) * 8));
tmp |= (val << ((where & 0x3) * 8));
tmp &= ~(0xff << ((where & 0x3) * 8));
tmp |= (val << ((where & 0x3) * 8));
- G
ALILEO_OUTL(tmp, GT_PCI0_CFGDATA_OFS
);
+ G
T_WRITE(GT_PCI0_CFGDATA_OFS, tmp
);
return PCIBIOS_SUCCESSFUL;
}
return PCIBIOS_SUCCESSFUL;
}