diff options
| author | Linus Walleij <linus.walleij@linaro.org> | 2013-03-16 22:03:41 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2013-06-03 08:04:40 +0200 |
| commit | 01ef31053ddda5d5aee86dca61193d1395273d53 (patch) | |
| tree | 47a14b66449b85526bb5ac2dd453d7ac69e2e3ff /arch | |
| parent | a5ecbab7d9b606bdfbec67ccda0fde0f82e1e70e (diff) | |
| download | op-kernel-dev-01ef31053ddda5d5aee86dca61193d1395273d53.zip op-kernel-dev-01ef31053ddda5d5aee86dca61193d1395273d53.tar.gz | |
ARM: integrator: move VGA base assignment
The global vga_base is used for things like getting an early
console on a PCI-based VGA adapter. Move this assignment into
the probe function for the PCI bridge.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 2 | ||||
| -rw-r--r-- | arch/arm/mach-integrator/pci_v3.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 8db3799..6375657 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c @@ -41,7 +41,6 @@ #include <linux/stat.h> #include <linux/sys_soc.h> #include <linux/termios.h> -#include <video/vga.h> #include <mach/hardware.h> #include <mach/platform.h> @@ -145,7 +144,6 @@ static struct map_desc ap_io_desc[] __initdata __maybe_unused = { static void __init ap_map_io(void) { iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc)); - vga_base = (unsigned long)PCI_MEMORY_VADDR; pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE)); } diff --git a/arch/arm/mach-integrator/pci_v3.c b/arch/arm/mach-integrator/pci_v3.c index 9dd7125..059ac4e 100644 --- a/arch/arm/mach-integrator/pci_v3.c +++ b/arch/arm/mach-integrator/pci_v3.c @@ -28,6 +28,7 @@ #include <linux/init.h> #include <linux/io.h> #include <linux/platform_device.h> +#include <video/vga.h> #include <mach/hardware.h> #include <mach/platform.h> @@ -850,6 +851,7 @@ static int __init pci_v3_probe(struct platform_device *pdev) return -ENODEV; } + vga_base = (unsigned long)PCI_MEMORY_VADDR; pci_common_init(&pci_v3); return 0; |
