diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2013-12-30 13:15:31 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2014-01-09 00:08:44 -0800 |
| commit | 301c5a993d62d74e98cb965fcb04eeffb0e1db32 (patch) | |
| tree | 0c3f3943778d4a920b22bc926538c17de5b95314 | |
| parent | 0158a4a733d8f7141530279ba4653004704e9306 (diff) | |
| download | op-kernel-dev-301c5a993d62d74e98cb965fcb04eeffb0e1db32.zip op-kernel-dev-301c5a993d62d74e98cb965fcb04eeffb0e1db32.tar.gz | |
ARM: msm: Only build timer.c if required
The MSM timer is only used on MSM devices that don't have the
architected timers. Introduce a hidden Kconfig option for this
driver so that we don't build it on the platforms that don't need
it.
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
| -rw-r--r-- | arch/arm/mach-msm/Kconfig | 9 | ||||
| -rw-r--r-- | arch/arm/mach-msm/Makefile | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig index 702553b..ff69e1c 100644 --- a/arch/arm/mach-msm/Kconfig +++ b/arch/arm/mach-msm/Kconfig @@ -16,6 +16,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 +28,7 @@ config ARCH_MSM7X30 select MSM_GPIOMUX select MSM_PROC_COMM select MSM_SMD + select MSM_TIMER select MSM_VIC config ARCH_QSD8X50 @@ -38,6 +40,7 @@ config ARCH_QSD8X50 select MSM_GPIOMUX select MSM_PROC_COMM select MSM_SMD + select MSM_TIMER select MSM_VIC endchoice @@ -50,6 +53,7 @@ config ARCH_MSM8X60 select GPIO_MSM_V2 select HAVE_SMP select MSM_SCM if SMP + select MSM_TIMER config ARCH_MSM8960 bool "MSM8960" @@ -59,6 +63,7 @@ config ARCH_MSM8960 select HAVE_SMP select GPIO_MSM_V2 select MSM_SCM if SMP + select MSM_TIMER config ARCH_MSM8974 bool "MSM8974" @@ -145,4 +150,8 @@ config MSM_GPIOMUX config MSM_SCM bool + +config MSM_TIMER + bool + endif diff --git a/arch/arm/mach-msm/Makefile b/arch/arm/mach-msm/Makefile index 6baae6e..8e307a1 100644 --- a/arch/arm/mach-msm/Makefile +++ b/arch/arm/mach-msm/Makefile @@ -1,4 +1,4 @@ -obj-y += timer.o +obj-$(CONFIG_MSM_TIMER) += timer.o obj-$(CONFIG_MSM_PROC_COMM) += clock.o obj-$(CONFIG_MSM_VIC) += irq-vic.o |
