]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
msm: add msm8x60_surf machine
authorSteve Muckle <smuckle@codeaurora.org>
Sat, 20 Mar 2010 00:00:08 +0000 (17:00 -0700)
committerDaniel Walker <dwalker@codeaurora.org>
Fri, 8 Oct 2010 22:12:47 +0000 (15:12 -0700)
Signed-off-by: Steve Muckle <smuckle@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
arch/arm/mach-msm/Kconfig
arch/arm/mach-msm/board-msm8x60.c

index 75b8c3d26068ce3a2d80a658c8da700ae78ab663..e0db899d118ad57fed99ad03a5e92030805204b1 100644 (file)
@@ -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
index 70087cad6731003c62b8602798cb65bd1b907740..a8a4d8d0ae3161222b98420205fbc7daeee37208 100644 (file)
@@ -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