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

Commit b71d8429 authored by Linus Walleij's avatar Linus Walleij Committed by Arnd Bergmann
Browse files

mach-integrator: fix VGA base regression 



The changes introduced in commit
cc22b4c1
"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: default avatarLinus Walleij <linus.walleij@stericsson.com>
Acked-by: default avatarRob Herring <rob.herring@calxeda.com>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parent a0638eb6

arch/arm/mach-integrator/integrator_ap.c

+2 −0
Original line number Original line Diff line number Diff line
@@ -32,6 +32,7 @@ 
#include <linux/interrupt.h>

#include <linux/interrupt.h>

#include <linux/io.h>

#include <linux/io.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/physmap.h>

#include <video/vga.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/platform.h>

#include <mach/platform.h>
@@ -154,6 +155,7 @@ static struct map_desc ap_io_desc[] __initdata = { 
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 = PCI_MEMORY_VADDR;

}

}





#define INTEGRATOR_SC_VALID_INT	0x003fffff

#define INTEGRATOR_SC_VALID_INT	0x003fffff

arch/arm/mach-integrator/pci_v3.c

+0 −2
Original line number Original line Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <linux/spinlock.h>

#include <linux/spinlock.h>

#include <linux/init.h>

#include <linux/init.h>

#include <linux/io.h>

#include <linux/io.h>

#include <video/vga.h>





#include <mach/hardware.h>

#include <mach/hardware.h>

#include <mach/platform.h>

#include <mach/platform.h>
@@ -505,7 +504,6 @@ void __init pci_v3_preinit(void) 




	pcibios_min_io = 0x6000;

	pcibios_min_io = 0x6000;

	pcibios_min_mem = 0x00100000;

	pcibios_min_mem = 0x00100000;

	vga_base = PCI_MEMORY_VADDR;





	/*

	/*

	 * Hook in our fault handler for PCI errors

	 * Hook in our fault handler for PCI errors