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

Commit 63fc5f3b authored by Aaro Koskinen's avatar Aaro Koskinen Committed by Tony Lindgren
Browse files

ARM: OMAP: add minimal support for Nokia RM-696 



Add minimal support for Nokia RM-696 board.

Signed-off-by: default avatarAaro Koskinen <aaro.koskinen@nokia.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 65f19159

arch/arm/mach-omap2/Kconfig

+2 −1
Original line number Diff line number Diff line
@@ -245,10 +245,11 @@ config MACH_NOKIA_N8X0 
	select MACH_NOKIA_N810_WIMAX



config MACH_NOKIA_RM680

	bool "Nokia RM-680 board"

	bool "Nokia RM-680/696 board"

	depends on ARCH_OMAP3

	default y

	select OMAP_PACKAGE_CBB

	select MACH_NOKIA_RM696



config MACH_NOKIA_RX51

	bool "Nokia RX-51 board"

arch/arm/mach-omap2/board-rm680.c

+13 −1
Original line number Diff line number Diff line 
/*

 * Board support file for Nokia RM-680.

 * Board support file for Nokia RM-680/696.

 *

 * Copyright (C) 2010 Nokia

 *
@@ -154,3 +154,15 @@ MACHINE_START(NOKIA_RM680, "Nokia RM-680 board") 
	.timer		= &omap3_timer,

	.restart	= omap_prcm_restart,

MACHINE_END



MACHINE_START(NOKIA_RM696, "Nokia RM-696 board")

	.atag_offset	= 0x100,

	.reserve	= omap_reserve,

	.map_io		= omap3_map_io,

	.init_early	= omap3630_init_early,

	.init_irq	= omap3_init_irq,

	.handle_irq	= omap3_intc_handle_irq,

	.init_machine	= rm680_init,

	.timer		= &omap3_timer,

	.restart	= omap_prcm_restart,

MACHINE_END

arch/arm/plat-omap/include/plat/uncompress.h

+1 −0
Original line number Diff line number Diff line
@@ -160,6 +160,7 @@ static inline void __arch_decomp_setup(unsigned long arch_id) 
		DEBUG_LL_OMAP3(3, igep0020);

		DEBUG_LL_OMAP3(3, igep0030);

		DEBUG_LL_OMAP3(3, nokia_rm680);

		DEBUG_LL_OMAP3(3, nokia_rm696);

		DEBUG_LL_OMAP3(3, nokia_rx51);

		DEBUG_LL_OMAP3(3, omap3517evm);

		DEBUG_LL_OMAP3(3, omap3_beagle);