aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-kirkwood/pcie.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-kirkwood/pcie.c')
-rw-r--r--arch/arm/mach-kirkwood/pcie.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/arm/mach-kirkwood/pcie.c b/arch/arm/mach-kirkwood/pcie.c
index ca294ff6d5b..74b992d810e 100644
--- a/arch/arm/mach-kirkwood/pcie.c
+++ b/arch/arm/mach-kirkwood/pcie.c
@@ -12,6 +12,7 @@
12#include <linux/pci.h> 12#include <linux/pci.h>
13#include <linux/slab.h> 13#include <linux/slab.h>
14#include <linux/mbus.h> 14#include <linux/mbus.h>
15#include <video/vga.h>
15#include <asm/irq.h> 16#include <asm/irq.h>
16#include <asm/mach/pci.h> 17#include <asm/mach/pci.h>
17#include <plat/pcie.h> 18#include <plat/pcie.h>
@@ -244,7 +245,8 @@ kirkwood_pcie_scan_bus(int nr, struct pci_sys_data *sys)
244 return bus; 245 return bus;
245} 246}
246 247
247static int __init kirkwood_pcie_map_irq(struct pci_dev *dev, u8 slot, u8 pin) 248static int __init kirkwood_pcie_map_irq(const struct pci_dev *dev, u8 slot,
249 u8 pin)
248{ 250{
249 struct pcie_port *pp = bus_to_port(dev->bus); 251 struct pcie_port *pp = bus_to_port(dev->bus);
250 252
@@ -271,6 +273,8 @@ static void __init add_pcie_port(int index, unsigned long base)
271 273
272void __init kirkwood_pcie_init(unsigned int portmask) 274void __init kirkwood_pcie_init(unsigned int portmask)
273{ 275{
276 vga_base = KIRKWOOD_PCIE_MEM_PHYS_BASE;
277
274 if (portmask & KW_PCIE0) 278 if (portmask & KW_PCIE0)
275 add_pcie_port(0, PCIE_VIRT_BASE); 279 add_pcie_port(0, PCIE_VIRT_BASE);
276 280