From: Kyungmin Park <kyungmin.park@samsung.com>
Date: Wed, 1 Nov 2006 18:43:19 +0000 (+0200)
Subject: [PATCH] ARM: OMAP2: fix apollon gpmc initialization
X-Git-Tag: v2.6.19-omap1~100
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a36627d0e096c7919a3ad9cdd57088bf749c9f1b;p=linux-2.6-omap-h63xx.git

[PATCH] ARM: OMAP2: fix apollon gpmc initialization

After update gpmc patch, apollon can't boot since gpmc init. In Apollon,
the CS0 uses 0x0000 0000.
If we don't modify boot_rom_space, we have to update all bootloaders. But
as you know it's difficult.

Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---

diff --git a/arch/arm/mach-omap2/gpmc.c b/arch/arm/mach-omap2/gpmc.c
index 73989d451e4..bbaab2925a5 100644
--- a/arch/arm/mach-omap2/gpmc.c
+++ b/arch/arm/mach-omap2/gpmc.c
@@ -17,6 +17,7 @@
 #include <linux/spinlock.h>
 
 #include <asm/io.h>
+#include <asm/mach-types.h>
 #include <asm/arch/gpmc.h>
 
 #undef DEBUG
@@ -353,6 +354,9 @@ void __init gpmc_mem_init(void)
 	 * even if we didn't boot from ROM.
 	 */
 	boot_rom_space = BOOT_ROM_SPACE;
+	/* In apollon the CS0 is mapped as 0x0000 0000 */
+	if (machine_is_omap_apollon())
+		boot_rom_space = 0;
 	gpmc_mem_root.start = GPMC_MEM_START + boot_rom_space;
 	gpmc_mem_root.end = GPMC_MEM_END;