Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03884f4e authored by Linus Walleij's avatar Linus Walleij
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 5283456d

arch/arm/mach-integrator/pci_v3.c

+7 −7
Original line number Diff line number Diff line
@@ -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",