diff options
| author | Gregory Bean <gbean@codeaurora.org> | 2010-04-05 09:29:02 +0400 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-10-09 02:12:49 +0400 |
| commit | 69b7f6ff855e32ec353475ce7b7246d293816078 (patch) | |
| tree | 6ec71468c971b067c22baccdbf4e9d7997b32256 /arch/arm/mach-msm | |
| parent | 57bbf1cc8c265f9d4c6831d9e3f07a72cf16ee27 (diff) | |
| download | linux-69b7f6ff855e32ec353475ce7b7246d293816078.tar.xz | |
msm: add MSM8x60 FFA support
The MSM8X60 FFA contains different components than the MSM8X60 SURF,
and therefore requires a different ARCH type and machine ID.
Signed-off-by: Gregory Bean <gbean@codeaurora.org>
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm/mach-msm')
| -rw-r--r-- | arch/arm/mach-msm/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/mach-msm/board-msm8x60.c | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 6cedfef480f0..3115a29dec4e 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/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/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c index 95b0e369feab..7486a681cc71 100644 --- a/arch/arm/mach-msm/board-msm8x60.c +++ b/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 |