diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-01-10 10:18:49 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-01-11 20:25:22 +0100 |
| commit | 67c6b2ef2662b17cc2174f2bdc22a7cb818a8376 (patch) | |
| tree | 2362141abb7549fd9720977d66f4eb01cbc98aa6 | |
| parent | Merge tag 'mvebu_fixes_for_v3.8-rc3' of git://git.infradead.org/users/jcooper... (diff) | |
| download | linux-67c6b2ef2662b17cc2174f2bdc22a7cb818a8376.tar.xz linux-67c6b2ef2662b17cc2174f2bdc22a7cb818a8376.zip | |
ARM: integrator: move syscon remap for AP PCIv3
The Integrator/AP syscon remapping was done in the .setup()
function rather than .preinit() which is wrong - .preinit()
is called before .setup() and the former also use the syscon
base and cause a crash since it was not yet remapped.
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index be50e795536d..e7fcea7f3300 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -475,13 +475,12 @@ int __init pci_v3_setup(int nr, struct pci_sys_data *sys) { int ret = 0; + if (!ap_syscon_base) + return -EINVAL; + if (nr == 0) { sys->mem_offset = PHYS_PCI_MEM_BASE; ret = pci_v3_setup_resources(sys); - /* Remap the Integrator system controller */ - ap_syscon_base = ioremap(INTEGRATOR_SC_BASE, 0x100); - if (!ap_syscon_base) - return -EINVAL; } return ret; @@ -497,6 +496,13 @@ void __init pci_v3_preinit(void) unsigned int temp; int ret; + /* 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; /* |