aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorSteve Muckle <smuckle@codeaurora.org>2010-03-19 17:00:08 -0700
committerDaniel Walker <dwalker@codeaurora.org>2010-10-08 15:12:47 -0700
commit49b76f718d634599693e18efe169adfa2d5b75e8 (patch)
tree95da6a5b5dec3bc684dd4b298d461a6e1e826be2 /arch/arm
parent998ba079fee7d9639003d77521d2117db17b4a04 (diff)
downloadkernel_samsung_aries-49b76f718d634599693e18efe169adfa2d5b75e8.zip
kernel_samsung_aries-49b76f718d634599693e18efe169adfa2d5b75e8.tar.gz
kernel_samsung_aries-49b76f718d634599693e18efe169adfa2d5b75e8.tar.bz2
msm: add msm8x60_surf machine
Signed-off-by: Steve Muckle <smuckle@codeaurora.org> Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-msm/Kconfig8
-rw-r--r--arch/arm/mach-msm/board-msm8x60.c7
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index 75b8c3d..e0db899 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_RUMI3 if (!MACH_MSM8X60_RUMI3)
+ select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3)
endchoice
@@ -100,6 +100,12 @@ config MACH_MSM8X60_RUMI3
help
Support for the Qualcomm MSM8x60 RUMI3 emulator.
+config MACH_MSM8X60_SURF
+ depends on ARCH_MSM8X60
+ bool "MSM8x60 SURF"
+ help
+ Support for the Qualcomm MSM8x60 SURF eval board.
+
endmenu
config MSM_DEBUG_UART
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index 70087ca..a8a4d8d 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -76,3 +76,10 @@ MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3")
.init_machine = msm8x60_init,
.timer = &msm_timer,
MACHINE_END
+
+MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF")
+ .map_io = msm8x60_map_io,
+ .init_irq = msm8x60_init_irq,
+ .init_machine = msm8x60_init,
+ .timer = &msm_timer,
+MACHINE_END