diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-02-03 00:06:04 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-03 08:04:37 +0200 |
| commit | 03884f4e6d638a10901e599c9591ffa1530e23c0 (patch) | |
| tree | 3953208a75c00d1eb33d3446571685c364999844 /arch/arm/mach-integrator | |
| parent | ARM: integrator: grab PCI error IRQ in probe() (diff) | |
| download | linux-03884f4e6d638a10901e599c9591ffa1530e23c0.tar.xz linux-03884f4e6d638a10901e599c9591ffa1530e23c0.zip | |
ARM: integrator: move PCI base address grab to probe
This moves the point where the PCIv3 driver grabs the SC base
address to the probe function.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch/arm/mach-integrator')
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index f027596d3e84..756a5f233c0c 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -496,13 +496,6 @@ static void __init pci_v3_preinit(void) unsigned long flags; unsigned int temp; - /* Remap the Integrator system controller */ - ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100); - if (!ap_syscon_base) { - pr_err("unable to remap the AP syscon for PCIv3\n"); - return; - } - pcibios_min_mem = 0x00100000; /* @@ -677,6 +670,13 @@ static int __init pci_v3_probe(struct platform_device *pdev) { int ret; + /* Remap the Integrator system controller */ + ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100); + if (!ap_syscon_base) { + dev_err(&pdev->dev, "unable to remap the AP syscon for PCIv3\n"); + return -ENODEV; + } + ret = devm_request_irq(&pdev->dev, IRQ_AP_V3INT, v3_irq, 0, "V3", NULL); if (ret) { dev_err(&pdev->dev, "unable to grab PCI error interrupt: %d\n", |