From: Max Filippov <jcmvbkbc@gmail.com>
Date: Mon, 16 Jul 2012 20:28:23 +0000 (+0400)
Subject: xtensa: add missing bits required for pci/quirks.c
X-Git-Tag: next-20120816~78^2~5
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=75ad645a6efde821b4eb327d856ef8dcaa68449c;p=karo-tx-linux.git

xtensa: add missing bits required for pci/quirks.c

This allows building kernel in allmodconfig configuration.

Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
---

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 8ed64cfae4ff..2675deb23df7 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -11,6 +11,7 @@ config XTENSA
 	select HAVE_GENERIC_HARDIRQS
 	select GENERIC_IRQ_SHOW
 	select GENERIC_CPU_DEVICES
+	select GENERIC_PCI_IOMAP
 	help
 	  Xtensa processors are 32-bit RISC machines designed by Tensilica
 	  primarily for embedded systems.  These processors are both
diff --git a/arch/xtensa/include/asm/io.h b/arch/xtensa/include/asm/io.h
index 4beb43c087d3..c4d8b625ac92 100644
--- a/arch/xtensa/include/asm/io.h
+++ b/arch/xtensa/include/asm/io.h
@@ -16,6 +16,7 @@
 #include <asm/page.h>
 #include <linux/bug.h>
 #include <linux/kernel.h>
+#include <asm-generic/iomap.h>
 
 #include <linux/types.h>
 
@@ -112,6 +113,15 @@ static inline void iounmap(void *addr)
 #define writew(b, addr) (void)((*(volatile unsigned short *)(addr)) = (b))
 #define writel(b, addr) (void)((*(volatile unsigned int *)(addr)) = (b))
 
+#define ioport_map(port, nr) ((void __iomem *)(port))
+
+#define ioread8 read
+#define ioread16 readw
+#define ioread32 readl
+#define iowrite8 writeb
+#define iowrite16 writew
+#define iowrite32 writel
+
 static inline __u8 __raw_readb(const volatile void __iomem *addr)
 {
           return *(__force volatile __u8 *)(addr);
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 43e9fdce40d6..96ccf17bcf31 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -25,6 +25,7 @@
 #include <linux/sched.h>
 #include <linux/errno.h>
 #include <linux/bootmem.h>
+#include <linux/module.h>
 
 #include <asm/pci-bridge.h>
 #include <asm/platform.h>
@@ -376,3 +377,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
 	return ret;
 }
+
+void pci_iounmap(struct pci_dev *dev, void __iomem *addr)
+{
+	iounmap(addr);
+}
+EXPORT_SYMBOL(pci_iounmap);