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

Commit 7f245162 authored by Kyungmin Park's avatar Kyungmin Park Committed by Linus Torvalds
Browse files

[PATCH] ARM: OMAP: fix GPMC compiler errors 



Fix GPMC compiler errors on OMAP2

Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
Cc: Russell King <rmk@arm.linux.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent de4fa992

arch/arm/mach-omap2/gpmc.c

+8 −13
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/spinlock.h>



#include <asm/io.h>

#include <asm/mach-types.h>

#include <asm/arch/gpmc.h>



#undef DEBUG
@@ -338,19 +339,13 @@ void __init gpmc_mem_init(void) 
	int cs;

	unsigned long boot_rom_space = 0;



	if (cpu_is_omap242x()) {

		u32 l;

		l = omap_readl(OMAP242X_CONTROL_STATUS);

		/* In case of internal boot the 1st MB is redirected to the

		 * boot ROM memory space.

		 */

		if (l & (1 << 3))

			boot_rom_space = BOOT_ROM_SPACE;

	} else

		/* We assume internal boot if the mode can't be

		 * determined.

	/* never allocate the first page, to facilitate bug detection;

	 * 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;