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

Commit 57bbf1cc authored by Steve Muckle's avatar Steve Muckle Committed by Daniel Walker
Browse files

msm: MSM8X60 simulator board support 



Board configuration for MSM8X60 simulation.

Signed-off-by: default avatarSteve Muckle <smuckle@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 49b76f71

arch/arm/mach-msm/Kconfig

+7 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ config ARCH_MSM8X60 
	select CPU_V7

	select CPU_V7

	select MSM_V2_TLMM

	select MSM_V2_TLMM

	select MSM_GPIOMUX

	select MSM_GPIOMUX

	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3)

	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM)





endchoice

endchoice
@@ -106,6 +106,12 @@ config MACH_MSM8X60_SURF 
	help

	help

	  Support for the Qualcomm MSM8x60 SURF eval board.

	  Support for the Qualcomm MSM8x60 SURF eval board.





config MACH_MSM8X60_SIM

	depends on ARCH_MSM8X60

	bool "MSM8x60 Simulator"

	help

	  Support for the Qualcomm MSM8x60 simulator.



endmenu

endmenu





config MSM_DEBUG_UART

config MSM_DEBUG_UART

arch/arm/mach-msm/board-msm8x60.c

+9 −1
Original line number Original line Diff line number Diff line
@@ -54,6 +54,7 @@ static void __init msm8x60_init_irq(void) 
	/* RUMI does not adhere to GIC spec by enabling STIs by default.

	/* RUMI does not adhere to GIC spec by enabling STIs by default.

	 * Enable/clear is supposed to be RO for STIs, but is RW on RUMI.

	 * Enable/clear is supposed to be RO for STIs, but is RW on RUMI.

	 */

	 */

	if (!machine_is_msm8x60_sim())

		writel(0x0000FFFF, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);

		writel(0x0000FFFF, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);





	/* FIXME: Not installing AVS_SVICINT and AVS_SVICINTSWDONE yet

	/* FIXME: Not installing AVS_SVICINT and AVS_SVICINTSWDONE yet
@@ -83,3 +84,10 @@ MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF") 
	.init_machine = msm8x60_init,

	.init_machine = msm8x60_init,

	.timer = &msm_timer,

	.timer = &msm_timer,

MACHINE_END

MACHINE_END



MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR")

	.map_io = msm8x60_map_io,

	.init_irq = msm8x60_init_irq,

	.init_machine = msm8x60_init,

	.timer = &msm_timer,

MACHINE_END