Skip to content

Commit

Permalink
msm: add MSM8x60 FFA support
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gregory Bean authored and Daniel Walker committed Oct 8, 2010
1 parent 57bbf1c commit 69b7f6f
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
9 changes: 8 additions & 1 deletion arch/arm/mach-msm/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions arch/arm/mach-msm/board-msm8x60.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 69b7f6f

Please sign in to comment.