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

Commit e37fce73 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge branch 'qcom/soc2' into next/soc 



* qcom/soc2:
  ARM: msm: Move MSM's DT based hardware to multi-platform support
  ARM: msm: Only build timer.c if required
  ARM: msm: Only build clock.c on proc_comm based platforms

Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 51f37801 4f204117

arch/arm/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -651,10 +651,10 @@ config ARCH_PXA 
	help

	  Support for Intel/Marvell's PXA2xx/PXA3xx processor line.



config ARCH_MSM

config ARCH_MSM_NODT

	bool "Qualcomm MSM"

	select ARCH_MSM

	select ARCH_REQUIRE_GPIOLIB

	select CLKSRC_OF if OF

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	help

arch/arm/mach-msm/Kconfig

+48 −37
Original line number Diff line number Diff line 
config ARCH_MSM

	bool



config ARCH_MSM_DT

	bool "Qualcomm MSM DT Support" if ARCH_MULTI_V7

	select ARCH_MSM

	select ARCH_REQUIRE_GPIOLIB

	select CLKSRC_OF

	select GENERIC_CLOCKEVENTS

	help

	  Support for Qualcomm's devicetree based MSM systems.



if ARCH_MSM



comment "Qualcomm MSM SoC Type"

menu "Qualcomm MSM SoC Selection"

	depends on ARCH_MSM_DT



config ARCH_MSM8X60

	bool "Enable support for MSM8X60"

	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select MSM_SCM if SMP

	select MSM_TIMER



config ARCH_MSM8960

	bool "Enable support for MSM8960"

	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select MSM_SCM if SMP

	select MSM_TIMER



config ARCH_MSM8974

	bool "Enable support for MSM8974"

	select ARM_GIC

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select HAVE_SMP

	select MSM_SCM if SMP



endmenu



choice

	prompt "Qualcomm MSM SoC Type"

	default ARCH_MSM7X00A

	depends on !ARCH_MSM_DT

	depends on ARCH_MSM_NODT



config ARCH_MSM7X00A

	bool "MSM7x00A / MSM7x01A"
@@ -16,6 +54,7 @@ config ARCH_MSM7X00A 
	select MACH_TROUT if !MACH_HALIBUT

	select MSM_PROC_COMM

	select MSM_SMD

	select MSM_TIMER

	select MSM_SMD_PKG3



config ARCH_MSM7X30
@@ -27,6 +66,7 @@ config ARCH_MSM7X30 
	select MSM_GPIOMUX

	select MSM_PROC_COMM

	select MSM_SMD

	select MSM_TIMER

	select MSM_VIC



config ARCH_QSD8X50
@@ -38,43 +78,11 @@ config ARCH_QSD8X50 
	select MSM_GPIOMUX

	select MSM_PROC_COMM

	select MSM_SMD

	select MSM_TIMER

	select MSM_VIC



endchoice



config ARCH_MSM8X60

	bool "MSM8X60"

	select ARCH_MSM_DT

	select ARM_GIC

	select CPU_V7

	select GPIO_MSM_V2

	select HAVE_SMP

	select MSM_SCM if SMP



config ARCH_MSM8960

	bool "MSM8960"

	select ARCH_MSM_DT

	select ARM_GIC

	select CPU_V7

	select HAVE_SMP

	select GPIO_MSM_V2

	select MSM_SCM if SMP



config ARCH_MSM8974

	bool "MSM8974"

	select ARCH_MSM_DT

	select ARM_GIC

	select CPU_V7

	select HAVE_ARM_ARCH_TIMER

	select HAVE_SMP

	select MSM_SCM if SMP

	select USE_OF



config ARCH_MSM_DT

	bool

	select SPARSE_IRQ

	select USE_OF



config MSM_HAS_DEBUG_UART_HS

	bool
@@ -91,7 +99,7 @@ config MSM_VIC 
	bool



menu "Qualcomm MSM Board Type"

	depends on !ARCH_MSM_DT

	depends on ARCH_MSM_NODT



config MACH_HALIBUT

	depends on ARCH_MSM
@@ -139,10 +147,13 @@ config MSM_SMD 


config MSM_GPIOMUX

	bool

	depends on !ARCH_MSM_DT

	help

	  Support for MSM V1 TLMM GPIOMUX architecture.



config MSM_SCM

	bool



config MSM_TIMER

	bool



endif

arch/arm/mach-msm/Makefile

+2 −2
Original line number Diff line number Diff line 
obj-y += timer.o

obj-y += clock.o

obj-$(CONFIG_MSM_TIMER) += timer.o

obj-$(CONFIG_MSM_PROC_COMM) += clock.o



obj-$(CONFIG_MSM_VIC) += irq-vic.o