Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69b7f6ff authored by Gregory Bean's avatar Gregory Bean Committed by Daniel Walker
Browse files

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: default avatarGregory Bean <gbean@codeaurora.org>
Signed-off-by: default avatarDaniel Walker <dwalker@codeaurora.org>
parent 57bbf1cc

arch/arm/mach-msm/Kconfig

+8 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,8 @@ config ARCH_MSM8X60 
	select CPU_V7

	select CPU_V7

	select MSM_V2_TLMM

	select MSM_V2_TLMM

	select MSM_GPIOMUX

	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

endchoice
@@ -112,6 +113,12 @@ config MACH_MSM8X60_SIM 
	help

	help

	  Support for the Qualcomm MSM8x60 simulator.

	  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

endmenu





config MSM_DEBUG_UART

config MSM_DEBUG_UART

arch/arm/mach-msm/board-msm8x60.c

+7 −0
Original line number Original line Diff line number Diff line
@@ -91,3 +91,10 @@ MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR") 
	.init_machine = msm8x60_init,

	.init_machine = msm8x60_init,

	.timer = &msm_timer,

	.timer = &msm_timer,

MACHINE_END

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