mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-03 17:40:04 +00:00
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>
This commit is contained in:
parent
a5ecbab7d9
commit
01ef31053d
2 changed files with 2 additions and 2 deletions
|
@ -41,7 +41,6 @@
|
||||||
#include <linux/stat.h>
|
#include <linux/stat.h>
|
||||||
#include <linux/sys_soc.h>
|
#include <linux/sys_soc.h>
|
||||||
#include <linux/termios.h>
|
#include <linux/termios.h>
|
||||||
#include <video/vga.h>
|
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <mach/platform.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)
|
static void __init ap_map_io(void)
|
||||||
{
|
{
|
||||||
iotable_init(ap_io_desc, ARRAY_SIZE(ap_io_desc));
|
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));
|
pci_map_io_early(__phys_to_pfn(PHYS_PCI_IO_BASE));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -28,6 +28,7 @@
|
||||||
#include <linux/init.h>
|
#include <linux/init.h>
|
||||||
#include <linux/io.h>
|
#include <linux/io.h>
|
||||||
#include <linux/platform_device.h>
|
#include <linux/platform_device.h>
|
||||||
|
#include <video/vga.h>
|
||||||
|
|
||||||
#include <mach/hardware.h>
|
#include <mach/hardware.h>
|
||||||
#include <mach/platform.h>
|
#include <mach/platform.h>
|
||||||
|
@ -850,6 +851,7 @@ static int __init pci_v3_probe(struct platform_device *pdev)
|
||||||
return -ENODEV;
|
return -ENODEV;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
vga_base = (unsigned long)PCI_MEMORY_VADDR;
|
||||||
pci_common_init(&pci_v3);
|
pci_common_init(&pci_v3);
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Reference in a new issue