From e9350b0c1fb51de9f2fef23397580f0589465116 Mon Sep 17 00:00:00 2001
From: Gregory Bean <gbean@codeaurora.org>
Date: Sun, 4 Apr 2010 22:29:02 -0700
Subject: [PATCH] --- yaml --- r: 212622 b: refs/heads/master c:
 69b7f6ff855e32ec353475ce7b7246d293816078 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/mach-msm/Kconfig         | 9 ++++++++-
 trunk/arch/arm/mach-msm/board-msm8x60.c | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 032ffdaa1a1a..dc8763141e70 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 57bbf1cc8c265f9d4c6831d9e3f07a72cf16ee27
+refs/heads/master: 69b7f6ff855e32ec353475ce7b7246d293816078
diff --git a/trunk/arch/arm/mach-msm/Kconfig b/trunk/arch/arm/mach-msm/Kconfig
index 6cedfef480f0..3115a29dec4e 100644
--- a/trunk/arch/arm/mach-msm/Kconfig
+++ b/trunk/arch/arm/mach-msm/Kconfig
@@ -41,7 +41,8 @@ config ARCH_MSM8X60
 	select CPU_V7
 	select MSM_V2_TLMM
 	select MSM_GPIOMUX
-	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM)
+	select MACH_MSM8X60_SURF if (!MACH_MSM8X60_RUMI3 && !MACH_MSM8X60_SIM \
+				  && !MACH_MSM8X60_FFA)
 
 endchoice
 
@@ -112,6 +113,12 @@ config MACH_MSM8X60_SIM
 	help
 	  Support for the Qualcomm MSM8x60 simulator.
 
+config MACH_MSM8X60_FFA
+	depends on ARCH_MSM8X60
+	bool "MSM8x60 FFA"
+	help
+	  Support for the Qualcomm MSM8x60 FFA 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 95b0e369feab..7486a681cc71 100644
--- a/trunk/arch/arm/mach-msm/board-msm8x60.c
+++ b/trunk/arch/arm/mach-msm/board-msm8x60.c
@@ -91,3 +91,10 @@ MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR")
 	.init_machine = msm8x60_init,
 	.timer = &msm_timer,
 MACHINE_END
+
+MACHINE_START(MSM8X60_FFA, "QCT MSM8X60 FFA")
+	.map_io = msm8x60_map_io,
+	.init_irq = msm8x60_init_irq,
+	.init_machine = msm8x60_init,
+	.timer = &msm_timer,
+MACHINE_END