From f84825c7e6df08c45d96aa2626747ee97ed5b06b Mon Sep 17 00:00:00 2001
From: David Howells <dhowells@redhat.com>
Date: Wed, 12 Dec 2012 15:36:39 +0000
Subject: [PATCH] --- yaml --- r: 340371 b: refs/heads/master c:
 83c2dc15ce824450e7044b9f90cd529c25747ae0 h: refs/heads/master i:   340369:
 c97f216b5daff81e53a7cfcdc334e692810f9217   340367:
 446ce475f947c978cafc58d6bd0cb725e2ead147 v: v3

---
 [refs]                                      |  2 +-
 trunk/arch/mn10300/include/asm/io.h         |  2 +-
 trunk/arch/mn10300/unit-asb2305/pci-iomap.c | 35 +++++++++++++++++++++
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/mn10300/unit-asb2305/pci-iomap.c

diff --git a/[refs] b/[refs]
index 1d72bdfd2593..7d742cfd1bb4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0369c360e5825e34ff58c140aa7fbb9855ad1e4a
+refs/heads/master: 83c2dc15ce824450e7044b9f90cd529c25747ae0
diff --git a/trunk/arch/mn10300/include/asm/io.h b/trunk/arch/mn10300/include/asm/io.h
index 139df8c53de8..70f1c06e29de 100644
--- a/trunk/arch/mn10300/include/asm/io.h
+++ b/trunk/arch/mn10300/include/asm/io.h
@@ -258,7 +258,7 @@ static inline void __iomem *__ioremap(unsigned long offset, unsigned long size,
 
 static inline void __iomem *ioremap(unsigned long offset, unsigned long size)
 {
-	return (void __iomem *) offset;
+	return (void __iomem *)(offset & ~0x20000000);
 }
 
 /*
diff --git a/trunk/arch/mn10300/unit-asb2305/pci-iomap.c b/trunk/arch/mn10300/unit-asb2305/pci-iomap.c
new file mode 100644
index 000000000000..bd65dae17f32
--- /dev/null
+++ b/trunk/arch/mn10300/unit-asb2305/pci-iomap.c
@@ -0,0 +1,35 @@
+/* ASB2305 PCI I/O mapping handler
+ *
+ * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
+ * Written by David Howells (dhowells@redhat.com)
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public Licence
+ * as published by the Free Software Foundation; either version
+ * 2 of the Licence, or (at your option) any later version.
+ */
+#include <linux/pci.h>
+#include <linux/module.h>
+
+/*
+ * Create a virtual mapping cookie for a PCI BAR (memory or IO)
+ */
+void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
+{
+	resource_size_t start = pci_resource_start(dev, bar);
+	resource_size_t len = pci_resource_len(dev, bar);
+	unsigned long flags = pci_resource_flags(dev, bar);
+
+	if (!len || !start)
+		return NULL;
+
+	if ((flags & IORESOURCE_IO) || (flags & IORESOURCE_MEM)) {
+		if (flags & IORESOURCE_CACHEABLE && !(flags & IORESOURCE_IO))
+			return ioremap(start, len);
+		else
+			return ioremap_nocache(start, len);
+	}
+
+	return NULL;
+}
+EXPORT_SYMBOL(pci_iomap);