summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-01-29 16:14:29 +0900
committerPaul Mundt <lethal@linux-sh.org>2010-01-29 16:14:29 +0900
commit9762528f37ddc7071509dddb10e7b4b3b957fd01 (patch)
tree88febf952479c46ef59c96386e02dd24842685f5
parentabec86a80247ab3a40d2afc9c8e8c26efcab2391 (diff)
downloadop-kernel-dev-9762528f37ddc7071509dddb10e7b4b3b957fd01.zip
op-kernel-dev-9762528f37ddc7071509dddb10e7b4b3b957fd01.tar.gz
sh: Kill off deprecated fixed PCI memory window accessors.
This kills off the deprected fixed memory range accessors for the cases of non-translatable ioremapping. Signed-off-by: Paul Mundt <lethal@linux-sh.org>
-rw-r--r--arch/sh/include/asm/pci.h14
-rw-r--r--arch/sh/mm/ioremap.c15
2 files changed, 0 insertions, 29 deletions
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h
index 67f3999..f362d8a 100644
--- a/arch/sh/include/asm/pci.h
+++ b/arch/sh/include/asm/pci.h
@@ -99,20 +99,6 @@ static inline void pci_dma_burst_advice(struct pci_dev *pdev,
}
#endif
-#ifdef CONFIG_SUPERH32
-/*
- * If we're on an SH7751 or SH7780 PCI controller, PCI memory is mapped
- * at the end of the address space in a special non-translatable area.
- */
-#define PCI_MEM_FIXED_START 0xfd000000
-#define PCI_MEM_FIXED_END (PCI_MEM_FIXED_START + 0x01000000)
-
-#define is_pci_memory_fixed_range(s, e) \
- ((s) >= PCI_MEM_FIXED_START && (e) < PCI_MEM_FIXED_END)
-#else
-#define is_pci_memory_fixed_range(s, e) (0)
-#endif
-
/* Board-specific fixup routines. */
int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin);
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c
index bb03308..94583c5 100644
--- a/arch/sh/mm/ioremap.c
+++ b/arch/sh/mm/ioremap.c
@@ -46,18 +46,6 @@ __ioremap_caller(unsigned long phys_addr, unsigned long size,
return NULL;
/*
- * If we're in the fixed PCI memory range, mapping through page
- * tables is not only pointless, but also fundamentally broken.
- * Just return the physical address instead.
- *
- * For boards that map a small PCI memory aperture somewhere in
- * P1/P2 space, ioremap() will already do the right thing,
- * and we'll never get this far.
- */
- if (is_pci_memory_fixed_range(phys_addr, size))
- return (void __iomem *)phys_addr;
-
- /*
* Mappings have to be page-aligned
*/
offset = phys_addr & ~PAGE_MASK;
@@ -125,9 +113,6 @@ static inline int iomapping_nontranslatable(unsigned long offset)
return 1;
#endif
- if (is_pci_memory_fixed_range(offset, 0))
- return 1;
-
return 0;
}
OpenPOWER on IntegriCloud