Commit 9762528f37ddc7071509dddb10e7b4b3b957fd01
1 parent
abec86a802
Exists in
master
and in
7 other branches
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>
Showing 2 changed files with 0 additions and 29 deletions Side-by-side Diff
arch/sh/include/asm/pci.h
| ... | ... | @@ -99,20 +99,6 @@ |
| 99 | 99 | } |
| 100 | 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 | 102 | /* Board-specific fixup routines. */ |
| 117 | 103 | int pcibios_map_platform_irq(struct pci_dev *dev, u8 slot, u8 pin); |
| 118 | 104 |
arch/sh/mm/ioremap.c
| ... | ... | @@ -46,18 +46,6 @@ |
| 46 | 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 | 49 | * Mappings have to be page-aligned |
| 62 | 50 | */ |
| 63 | 51 | offset = phys_addr & ~PAGE_MASK; |
| ... | ... | @@ -124,9 +112,6 @@ |
| 124 | 112 | if (PXSEG(offset) < P3SEG || offset >= P3_ADDR_MAX) |
| 125 | 113 | return 1; |
| 126 | 114 | #endif |
| 127 | - | |
| 128 | - if (is_pci_memory_fixed_range(offset, 0)) | |
| 129 | - return 1; | |
| 130 | 115 | |
| 131 | 116 | return 0; |
| 132 | 117 | } |