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

Commit 50ede4e3 authored by Stepan Moskovchenko's avatar Stepan Moskovchenko Committed by David Brown
Browse files

msm: Support for the MSM8960 RUMI3 target



Add the machine record, init code, and build support for
the MSM8960 RUMI3.

Signed-off-by: default avatarStepan Moskovchenko <stepanm@codeaurora.org>
Signed-off-by: default avatarDavid Brown <davidb@codeaurora.org>
parent f441ca2d
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ config ARCH_MSM8X60
config ARCH_MSM8960
	bool "MSM8960"
	select ARCH_MSM_SCORPIONMP
	select MACH_MSM8960_SIM
	select MACH_MSM8960_SIM if (!MACH_MSM8960_RUMI3)
	select ARM_GIC
	select CPU_V7
	select MSM_V2_TLMM
@@ -141,6 +141,12 @@ config MACH_MSM8960_SIM
	help
	  Support for the Qualcomm MSM8960 simulator.

config MACH_MSM8960_RUMI3
	depends on ARCH_MSM8960
	bool "MSM8960 RUMI3"
	help
	  Support for the Qualcomm MSM8960 RUMI3 emulator.

endmenu

config IOMMU_PGTABLES_L2
+10 −0
Original line number Diff line number Diff line
@@ -41,6 +41,9 @@ static void __init msm8960_init_irq(void)
	/* Edge trigger PPIs except AVS_SVICINT and AVS_SVICINTSWDONE */
	writel(0xFFFFD7FF, MSM_QGIC_DIST_BASE + GIC_DIST_CONFIG + 4);

	if (machine_is_msm8960_rumi3())
		writel(0x0000FFFF, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);

	/* FIXME: Not installing AVS_SVICINT and AVS_SVICINTSWDONE yet
	 * as they are configured as level, which does not play nice with
	 * handle_percpu_irq.
@@ -56,3 +59,10 @@ MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")
	.init_irq = msm8960_init_irq,
	.timer = &msm_timer,
MACHINE_END

MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")
	.map_io = msm8960_map_io,
	.init_irq = msm8960_init_irq,
	.timer = &msm_timer,
MACHINE_END