diff options
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/include/asm/pci.h | 14 | ||||
-rw-r--r-- | arch/sh/mm/ioremap.c | 15 |
2 files changed, 0 insertions, 29 deletions
diff --git a/arch/sh/include/asm/pci.h b/arch/sh/include/asm/pci.h index 67f3999b544e..f362d8a045e7 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, | |||
99 | } | 99 | } |
100 | #endif | 100 | #endif |
101 | 101 | ||
102 | #ifdef CONFIG_SUPERH32 | ||
103 | /* | ||
104 | * If we're on an SH7751 or SH7780 PCI controller, PCI memory is mapped | ||
105 | * at the end of the address space in a special non-translatable area. | ||
106 | */ | ||
107 | #define PCI_MEM_FIXED_START 0xfd000000 | ||
108 | #define PCI_MEM_FIXED_END (PCI_MEM_FIXED_START + 0x01000000) | ||
109 | |||
110 | #define is_pci_memory_fixed_range(s, e) \ | ||
111 | ((s) >= PCI_MEM_FIXED_START && (e) < PCI_MEM_FIXED_END) | ||
112 | #else | ||
113 | #define is_pci_memory_fixed_range(s, e) (0) | ||
114 | #endif | ||
115 | |||
116 | /* Board-specific fixup routines. */ | 102 | /* Board-specific fixup routines. */ |
117 | int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin); | 103 | int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin); |
118 | 104 | ||
diff --git a/arch/sh/mm/ioremap.c b/arch/sh/mm/ioremap.c index bb03308e8408..94583c5da855 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, | |||
46 | return NULL; | 46 | return NULL; |
47 | 47 | ||
48 | /* | 48 | /* |
49 | * If we're in the fixed PCI memory range, mapping through page | ||
50 | * tables is not only pointless, but also fundamentally broken. | ||
51 | * Just return the physical address instead. | ||
52 | * | ||
53 | * For boards that map a small PCI memory aperture somewhere in | ||
54 | * P1/P2 space, ioremap() will already do the right thing, | ||
55 | * and we'll never get this far. | ||
56 | */ | ||
57 | if (is_pci_memory_fixed_range(phys_addr, size)) | ||
58 | return (void __iomem *)phys_addr; | ||
59 | |||
60 | /* | ||
61 | * Mappings have to be page-aligned | 49 | * Mappings have to be page-aligned |
62 | */ | 50 | */ |
63 | offset = phys_addr & ~PAGE_MASK; | 51 | offset = phys_addr & ~PAGE_MASK; |
@@ -125,9 +113,6 @@ static inline int iomapping_nontranslatable(unsigned long offset) | |||
125 | return 1; | 113 | return 1; |
126 | #endif | 114 | #endif |
127 | 115 | ||
128 | if (is_pci_memory_fixed_range(offset, 0)) | ||
129 | return 1; | ||
130 | |||
131 | return 0; | 116 | return 0; |
132 | } | 117 | } |
133 | 118 | ||