mach-integrator: fix VGA base regression
authorLinus Walleij <linus.walleij@linaro.org>
Sun, 4 Sep 2011 21:40:08 +0000 (23:40 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 20 Sep 2011 20:58:41 +0000 (22:58 +0200)
commitb71d8429ec364ef8eada011dded2e23aaecde53e
tree7baf67bf7ca3a13acccc004dcd4317613f226c49
parenta0638eb6a2979840ff4cde19b100e96b97a91dfd
mach-integrator: fix VGA base regression

The changes introduced in commit
cc22b4c18540e5e8bf55c7d124044f9317527d3c
"ARM: set vga memory base at run-time"

Makes the Integrator/AP freeze completely. I appears that
this is due to the VGA base address being assigned at PCI
init time, while this base is needed earlier than that.
Moving the initialization of the base address to the
.map_io function solves this problem.

Cc: Rob Herring <rob.herring@calxeda.com>
Cc: Nicolas Pitre <nicolas.pitre@linaro.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@stericsson.com>
Acked-by: Rob Herring <rob.herring@calxeda.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
arch/arm/mach-integrator/integrator_ap.c
arch/arm/mach-integrator/pci_v3.c