aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-dove/pcie.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-dove/pcie.c')
-rw-r--r--arch/arm/mach-dove/pcie.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-dove/pcie.c b/arch/arm/mach-dove/pcie.c
index 502d1ca2f4b..aa2b3a09a51 100644
--- a/arch/arm/mach-dove/pcie.c
+++ b/arch/arm/mach-dove/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/mach/pci.h> 15#include <asm/mach/pci.h>
15#include <asm/mach/arch.h> 16#include <asm/mach/arch.h>
16#include <asm/setup.h> 17#include <asm/setup.h>
@@ -192,7 +193,7 @@ dove_pcie_scan_bus(int nr, struct pci_sys_data *sys)
192 return bus; 193 return bus;
193} 194}
194 195
195static int __init dove_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 196static int __init dove_pcie_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
196{ 197{
197 struct pcie_port *pp = bus_to_port(dev->bus->number); 198 struct pcie_port *pp = bus_to_port(dev->bus->number);
198 199
@@ -228,6 +229,8 @@ static void __init add_pcie_port(int index, unsigned long base)
228 229
229void __init dove_pcie_init(int init_port0, int init_port1) 230void __init dove_pcie_init(int init_port0, int init_port1)
230{ 231{
232 vga_base = DOVE_PCIE0_MEM_PHYS_BASE;
233
231 if (init_port0) 234 if (init_port0)
232 add_pcie_port(0, DOVE_PCIE0_VIRT_BASE); 235 add_pcie_port(0, DOVE_PCIE0_VIRT_BASE);
233 236