aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-versatile/pci.c
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 17:03:23 +0200
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2015-10-23 17:03:23 +0200
commit25fbe5ca4d0f37170451b682bd150a70f944aca0 (patch)
treec23f80847119d9f297206a37af2ad548ccdde802 /arch/arm/mach-versatile/pci.c
parentff67a6b9aaddb2dea6ed4a3f7df8a0c6acf131c2 (diff)
downloadkernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.zip
kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.gz
kernel_samsung_smdk4412-25fbe5ca4d0f37170451b682bd150a70f944aca0.tar.bz2
update other arm platforms from 3.2.72 and also merge some general arm code (boot)
Diffstat (limited to 'arch/arm/mach-versatile/pci.c')
-rw-r--r--arch/arm/mach-versatile/pci.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/mach-versatile/pci.c b/arch/arm/mach-versatile/pci.c
index 3f47259..189ed00 100644
--- a/arch/arm/mach-versatile/pci.c
+++ b/arch/arm/mach-versatile/pci.c
@@ -311,6 +311,9 @@ struct pci_bus * __init pci_versatile_scan_bus(int nr, struct pci_sys_data *sys)
void __init pci_versatile_preinit(void)
{
+ pcibios_min_io = 0x44000000;
+ pcibios_min_mem = 0x50000000;
+
__raw_writel(VERSATILE_PCI_MEM_BASE0 >> 28, PCI_IMAP0);
__raw_writel(VERSATILE_PCI_MEM_BASE1 >> 28, PCI_IMAP1);
__raw_writel(VERSATILE_PCI_MEM_BASE2 >> 28, PCI_IMAP2);
@@ -325,7 +328,7 @@ void __init pci_versatile_preinit(void)
/*
* map the specified device/slot/pin to an IRQ. Different backplanes may need to modify this.
*/
-static int __init versatile_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+static int __init versatile_map_irq(const struct pci_dev *dev, u8 slot, u8 pin)
{
int irq;
int devslot = PCI_SLOT(dev->devfn);