diff options
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r-- | arch/arm/mach-mv78xx0/include/mach/hardware.h | 7 | ||||
-rw-r--r-- | arch/arm/mach-mv78xx0/pcie.c | 14 |
2 files changed, 9 insertions, 12 deletions
diff --git a/arch/arm/mach-mv78xx0/include/mach/hardware.h b/arch/arm/mach-mv78xx0/include/mach/hardware.h index 5d887557e123..67cab0a08e07 100644 --- a/arch/arm/mach-mv78xx0/include/mach/hardware.h +++ b/arch/arm/mach-mv78xx0/include/mach/hardware.h | |||
@@ -11,11 +11,4 @@ | |||
11 | 11 | ||
12 | #include "mv78xx0.h" | 12 | #include "mv78xx0.h" |
13 | 13 | ||
14 | #define pcibios_assign_all_busses() 1 | ||
15 | |||
16 | #define PCIBIOS_MIN_IO 0x00001000 | ||
17 | #define PCIBIOS_MIN_MEM 0x01000000 | ||
18 | #define PCIMEM_BASE MV78XX0_PCIE_MEM_PHYS_BASE /* mem base for VGA */ | ||
19 | |||
20 | |||
21 | #endif | 14 | #endif |
diff --git a/arch/arm/mach-mv78xx0/pcie.c b/arch/arm/mach-mv78xx0/pcie.c index a560439dcc3c..c51af1cac300 100644 --- a/arch/arm/mach-mv78xx0/pcie.c +++ b/arch/arm/mach-mv78xx0/pcie.c | |||
@@ -11,6 +11,7 @@ | |||
11 | #include <linux/kernel.h> | 11 | #include <linux/kernel.h> |
12 | #include <linux/pci.h> | 12 | #include <linux/pci.h> |
13 | #include <linux/mbus.h> | 13 | #include <linux/mbus.h> |
14 | #include <video/vga.h> | ||
14 | #include <asm/irq.h> | 15 | #include <asm/irq.h> |
15 | #include <asm/mach/pci.h> | 16 | #include <asm/mach/pci.h> |
16 | #include <plat/pcie.h> | 17 | #include <plat/pcie.h> |
@@ -129,12 +130,12 @@ static void __init mv78xx0_pcie_preinit(void) | |||
129 | struct pcie_port *pp = pcie_port + i; | 130 | struct pcie_port *pp = pcie_port + i; |
130 | 131 | ||
131 | mv78xx0_setup_pcie_io_win(win++, pp->res[0].start, | 132 | mv78xx0_setup_pcie_io_win(win++, pp->res[0].start, |
132 | pp->res[0].end - pp->res[0].start + 1, | 133 | resource_size(&pp->res[0]), |
133 | pp->maj, pp->min); | 134 | pp->maj, pp->min); |
134 | 135 | ||
135 | mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start, | 136 | mv78xx0_setup_pcie_mem_win(win++, pp->res[1].start, |
136 | pp->res[1].end - pp->res[1].start + 1, | 137 | resource_size(&pp->res[1]), |
137 | pp->maj, pp->min); | 138 | pp->maj, pp->min); |
138 | } | 139 | } |
139 | } | 140 | } |
140 | 141 | ||
@@ -259,7 +260,8 @@ mv78xx0_pcie_scan_bus(int nr, struct pci_sys_data *sys) | |||
259 | return bus; | 260 | return bus; |
260 | } | 261 | } |
261 | 262 | ||
262 | static int __init mv78xx0_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin) | 263 | static int __init mv78xx0_pcie_map_irq(const struct pci_dev *dev, u8 slot, |
264 | u8 pin) | ||
263 | { | 265 | { |
264 | struct pcie_port *pp = bus_to_port(dev->bus->number); | 266 | struct pcie_port *pp = bus_to_port(dev->bus->number); |
265 | 267 | ||
@@ -297,6 +299,8 @@ static void __init add_pcie_port(int maj, int min, unsigned long base) | |||
297 | 299 | ||
298 | void __init mv78xx0_pcie_init(int init_port0, int init_port1) | 300 | void __init mv78xx0_pcie_init(int init_port0, int init_port1) |
299 | { | 301 | { |
302 | vga_base = MV78XX0_PCIE_MEM_PHYS_BASE; | ||
303 | |||
300 | if (init_port0) { | 304 | if (init_port0) { |
301 | add_pcie_port(0, 0, PCIE00_VIRT_BASE); | 305 | add_pcie_port(0, 0, PCIE00_VIRT_BASE); |
302 | if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { | 306 | if (!orion_pcie_x4_mode((void __iomem *)PCIE00_VIRT_BASE)) { |