diff options
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-kirkwood/include/mach/io.h | 2 | ||||
-rw-r--r-- | arch/arm/mach-kirkwood/pcie.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-kirkwood/include/mach/io.h b/arch/arm/mach-kirkwood/include/mach/io.h index a643a846d5fb..44e8be04f259 100644 --- a/arch/arm/mach-kirkwood/include/mach/io.h +++ b/arch/arm/mach-kirkwood/include/mach/io.h | |||
@@ -15,7 +15,7 @@ | |||
15 | 15 | ||
16 | static inline void __iomem *__io(unsigned long addr) | 16 | static inline void __iomem *__io(unsigned long addr) |
17 | { | 17 | { |
18 | return (void __iomem *)((addr - KIRKWOOD_PCIE_IO_PHYS_BASE) | 18 | return (void __iomem *)((addr - KIRKWOOD_PCIE_IO_BUS_BASE) |
19 | + KIRKWOOD_PCIE_IO_VIRT_BASE); | 19 | + KIRKWOOD_PCIE_IO_VIRT_BASE); |
20 | } | 20 | } |
21 | 21 | ||
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c index 553882033006..0660e78641e8 100644 --- a/arch/arm/mach-kirkwood/pcie.c +++ b/arch/arm/mach-kirkwood/pcie.c | |||
@@ -115,7 +115,7 @@ static int __init kirkwood_pcie_setup(int nr, struct pci_sys_data *sys) | |||
115 | */ | 115 | */ |
116 | res[0].name = "PCIe I/O Space"; | 116 | res[0].name = "PCIe I/O Space"; |
117 | res[0].flags = IORESOURCE_IO; | 117 | res[0].flags = IORESOURCE_IO; |
118 | res[0].start = KIRKWOOD_PCIE_IO_PHYS_BASE; | 118 | res[0].start = KIRKWOOD_PCIE_IO_BUS_BASE; |
119 | res[0].end = res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1; | 119 | res[0].end = res[0].start + KIRKWOOD_PCIE_IO_SIZE - 1; |
120 | if (request_resource(&ioport_resource, &res[0])) | 120 | if (request_resource(&ioport_resource, &res[0])) |
121 | panic("Request PCIe IO resource failed\n"); | 121 | panic("Request PCIe IO resource failed\n"); |