summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2007-08-01 19:04:51 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-01 20:48:17 -0700
commit04668873daa822aa6c806ba28d1143db8dcb26e8 (patch)
treec71f7864aa5ccd364619d6ee02b7ab3cb269c498 /arch
parentb5625481832ef1ab1a8e31fac0b1d14acdbbc148 (diff)
downloadlinux-stable-04668873daa822aa6c806ba28d1143db8dcb26e8.tar.gz
linux-stable-04668873daa822aa6c806ba28d1143db8dcb26e8.tar.bz2
linux-stable-04668873daa822aa6c806ba28d1143db8dcb26e8.zip
FRV: Enable the MB86943 PCI arbiter correctly
Enable the MB93090 motherboard's MB86943 PCI arbiter correctly by assigning to the register rather than comparing against it. This is required to support bus mastering. Signed-off-by: David Howells <dhowells@redhat.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/frv/mb93090-mb00/pci-vdk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/frv/mb93090-mb00/pci-vdk.c b/arch/frv/mb93090-mb00/pci-vdk.c
index 0b581e3cf7c7..6d51f133fb23 100644
--- a/arch/frv/mb93090-mb00/pci-vdk.c
+++ b/arch/frv/mb93090-mb00/pci-vdk.c
@@ -400,7 +400,8 @@ int __init pcibios_init(void)
__reg_MB86943_pci_sl_mem_base = __region_CS2 + 0x08000000;
mb();
- *(volatile unsigned long *)(__region_CS2+0x01300014) == 1;
+ /* enable PCI arbitration */
+ __reg_MB86943_pci_arbiter = MB86943_PCIARB_EN;
ioport_resource.start = (__reg_MB86943_sl_pci_io_base << 9) & 0xfffffc00;
ioport_resource.end = (__reg_MB86943_sl_pci_io_range << 9) | 0x3ff;