aboutsummaryrefslogtreecommitdiff
path: root/arch/sh/drivers
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2006-09-27 15:16:42 +0900
committerPaul Mundt <lethal@linux-sh.org>2006-09-27 15:16:42 +0900
commitd7cdc9e8ac82c43fdcd4fde6b5b53d2dcba7f707 (patch)
tree2489b1831a1b5818af0927e4d3c8933bf7d05f31 /arch/sh/drivers
parent26ff6c11ef38e08990c1e417c299246e6ab18ff7 (diff)
downloadlinux-2.6.34-ux500-d7cdc9e8ac82c43fdcd4fde6b5b53d2dcba7f707.tar.gz
sh: ioremap() overhaul.
ioremap() overhaul. Add support for transparent PMB mapping, get rid of p3_ioremap(), etc. Also drop ioremap() and iounmap() routines from the machvec, as everyone can use the generic ioremap() API instead. For PCI memory apertures and other special cases, use the pci_iomap() API, as boards are already required to get the mapping right there. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/drivers')
-rw-r--r--arch/sh/drivers/pci/pci.c21
1 files changed, 17 insertions, 4 deletions
diff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c
index 1f5e23e8b16..285dffd12bd 100644
--- a/arch/sh/drivers/pci/pci.c
+++ b/arch/sh/drivers/pci/pci.c
@@ -2,7 +2,7 @@
* arch/sh/drivers/pci/pci.c
*
* Copyright (c) 2002 M. R. Brown <mrbrown@linux-sh.org>
- * Copyright (c) 2004, 2005 Paul Mundt <lethal@linux-sh.org>
+ * Copyright (c) 2004 - 2006 Paul Mundt <lethal@linux-sh.org>
*
* These functions are collected here to reduce duplication of common
* code amongst the many platform-specific PCI support code files.
@@ -172,10 +172,23 @@ void __iomem *pci_iomap(struct pci_dev *dev, int bar, unsigned long maxlen)
return NULL;
if (maxlen && len > maxlen)
len = maxlen;
- if (flags & IORESOURCE_IO)
+
+ /*
+ * Presently the IORESOURCE_MEM case is a bit special, most
+ * SH7751 style PCI controllers have PCI memory at a fixed
+ * location in the address space where no remapping is desired
+ * (traditionally at 0xfd000000). Once this changes, the
+ * IORESOURCE_MEM case will have to switch to using ioremap() and
+ * more care will have to be taken to inhibit page table mapping
+ * for legacy cores.
+ *
+ * For now everything wraps to ioport_map(), since boards that
+ * have PCI will be able to check the address range properly on
+ * their own.
+ * -- PFM.
+ */
+ if (flags & (IORESOURCE_IO | IORESOURCE_MEM))
return ioport_map(start, len);
- if (flags & IORESOURCE_MEM)
- return ioremap(start, len);
return NULL;
}