summaryrefslogtreecommitdiff
path: root/arch/microblaze
diff options
context:
space:
mode:
authorJohn Linn <john.linn@xilinx.com>2010-02-24 12:55:02 -0700
committerMichal Simek <monstr@monstr.eu>2012-10-04 15:19:33 +0200
commitc74c8b1dcbaa890a064a5892e29cec5ce42d5b84 (patch)
treee0e393eb556e3bd7e316ebf9905fd5c5150b580f /arch/microblaze
parentaaa5241ebb53733663775c8a044004d63a126eb6 (diff)
downloadlinux-3.10-c74c8b1dcbaa890a064a5892e29cec5ce42d5b84.tar.gz
linux-3.10-c74c8b1dcbaa890a064a5892e29cec5ce42d5b84.tar.bz2
linux-3.10-c74c8b1dcbaa890a064a5892e29cec5ce42d5b84.zip
microblaze: Added more support for PCI
In order to use an off the shelf nic, like the intel pro card, changes are needed to support pci dma interfaces and other small changes. Signed-off-by: John Linn <john.linn@xilinx.com> Signed-off-by: Michal Simek <monstr@monstr.eu>
Diffstat (limited to 'arch/microblaze')
-rw-r--r--arch/microblaze/include/asm/io.h4
-rw-r--r--arch/microblaze/include/asm/pci.h2
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/microblaze/include/asm/io.h b/arch/microblaze/include/asm/io.h
index e4a79747860..4fbfdc1ac7f 100644
--- a/arch/microblaze/include/asm/io.h
+++ b/arch/microblaze/include/asm/io.h
@@ -35,6 +35,10 @@ extern resource_size_t isa_mem_base;
#define IO_SPACE_LIMIT (0xFFFFFFFF)
+/* the following is needed to support PCI with some drivers */
+
+#define mmiowb()
+
static inline unsigned char __raw_readb(const volatile void __iomem *addr)
{
return *(volatile unsigned char __force *)addr;
diff --git a/arch/microblaze/include/asm/pci.h b/arch/microblaze/include/asm/pci.h
index a0da88bf70c..41cc841091b 100644
--- a/arch/microblaze/include/asm/pci.h
+++ b/arch/microblaze/include/asm/pci.h
@@ -22,6 +22,8 @@
#include <asm/prom.h>
#include <asm/pci-bridge.h>
+#include <asm-generic/pci-dma-compat.h>
+
#define PCIBIOS_MIN_IO 0x1000
#define PCIBIOS_MIN_MEM 0x10000000