summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-msm
diff options
context:
space:
mode:
authorSteve Muckle <smuckle@codeaurora.org>2010-01-07 12:51:10 -0800
committerDaniel Walker <dwalker@codeaurora.org>2010-10-08 15:12:48 -0700
commit57bbf1cc8c265f9d4c6831d9e3f07a72cf16ee27 (patch)
tree700b7060230b30b6f8a6925e0a641f7ce3f21d33 /arch/arm/mach-msm
parent49b76f718d634599693e18efe169adfa2d5b75e8 (diff)
downloadop-kernel-dev-57bbf1cc8c265f9d4c6831d9e3f07a72cf16ee27.zip
op-kernel-dev-57bbf1cc8c265f9d4c6831d9e3f07a72cf16ee27.tar.gz
msm: MSM8X60 simulator board support
Board configuration for MSM8X60 simulation. Signed-off-by: Steve Muckle <smuckle@codeaurora.org> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm')
-rw-r--r--arch/arm/mach-msm/Kconfig8
-rw-r--r--arch/arm/mach-msm/board-msm8x60.c10
2 files changed, 16 insertions, 2 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index e0db899..6cedfef 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -41,7 +41,7 @@ config ARCH_MSM8X60
select CPU_V7
select MSM_V2_TLMM
select MSM_GPIOMUX
- select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3)
+ select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM)
endchoice
@@ -106,6 +106,12 @@ config MACH_MSM8X60_SURF
help
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
config MSM_DEBUG_UART
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index a8a4d8d..95b0e36 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -54,7 +54,8 @@ static void __init msm8x60_init_irq(void)
/* 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.
*/
- writel(0x0000FFFF, MSM_QGIC_DIST_BASE + GIC_DIST_ENABLE_SET);
+ if (!machine_is_msm8x60_sim())
+ 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
@@ -83,3 +84,10 @@ MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF")
.init_machine = msm8x60_init,
.timer = &msm_timer,
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
OpenPOWER on IntegriCloud