From 0d55ad60a746e232965039fa405cb6ad4bc406d3 Mon Sep 17 00:00:00 2001 From: Steve Muckle Date: Fri, 19 Mar 2010 17:00:08 -0700 Subject: [PATCH] --- yaml --- r: 212620 b: refs/heads/master c: 49b76f718d634599693e18efe169adfa2d5b75e8 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-msm/Kconfig | 8 +++++++- trunk/arch/arm/mach-msm/board-msm8x60.c | 7 +++++++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 7ac95337db03..4b7bbe6c6deb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 998ba079fee7d9639003d77521d2117db17b4a04 +refs/heads/master: 49b76f718d634599693e18efe169adfa2d5b75e8 diff --git a/trunk/arch/arm/mach-msm/Kconfig b/trunk/arch/arm/mach-msm/Kconfig index 75b8c3d26068..e0db899d118a 100644 --- a/trunk/arch/arm/mach-msm/Kconfig +++ b/trunk/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/trunk/arch/arm/mach-msm/board-msm8x60.c b/trunk/arch/arm/mach-msm/board-msm8x60.c index 70087cad6731..a8a4d8d0ae31 100644 --- a/trunk/arch/arm/mach-msm/board-msm8x60.c +++ b/trunk/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