From: Stephen Boyd <sboyd@codeaurora.org>
To: arm@kernel.org
Cc: linux-kernel@vger.kernel.org, linux-arm-msm@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
David Brown <davidb@codeaurora.org>
Subject: [PATCH v2 5/7] ARM: msm: Only build timer.c if required
Date: Mon, 30 Dec 2013 13:15:31 -0800 [thread overview]
Message-ID: <1388438133-431-6-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1388438133-431-1-git-send-email-sboyd@codeaurora.org>
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>
---
arch/arm/mach-msm/Kconfig | 9 +++++++++
arch/arm/mach-msm/Makefile | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
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..8e307a10 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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
WARNING: multiple messages have this Message-ID (diff)
From: sboyd@codeaurora.org (Stephen Boyd)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 5/7] ARM: msm: Only build timer.c if required
Date: Mon, 30 Dec 2013 13:15:31 -0800 [thread overview]
Message-ID: <1388438133-431-6-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1388438133-431-1-git-send-email-sboyd@codeaurora.org>
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>
---
arch/arm/mach-msm/Kconfig | 9 +++++++++
arch/arm/mach-msm/Makefile | 2 +-
2 files changed, 10 insertions(+), 1 deletion(-)
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..8e307a10 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
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
hosted by The Linux Foundation
next prev parent reply other threads:[~2013-12-30 21:15 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-30 21:15 [PATCH v2 0/7] Allow MSM DT platforms to be built multi-platform Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2013-12-30 21:15 ` [PATCH v2 1/7] usb: phy: msm: Move mach dependent code to platform data Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2013-12-30 21:15 ` [PATCH v2 2/7] mmc: msm_sdcc: Limit driver to platforms that use it Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2013-12-30 21:15 ` [PATCH v2 3/7] tty: serial: Limit msm_serial_hs " Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2014-01-02 18:10 ` Arnd Bergmann
2014-01-02 18:10 ` Arnd Bergmann
2014-01-02 20:20 ` Stephen Boyd
2014-01-02 20:20 ` Stephen Boyd
2014-01-02 20:26 ` Arnd Bergmann
2014-01-02 20:26 ` Arnd Bergmann
2013-12-30 21:15 ` [PATCH v2 4/7] ARM: msm: Only build clock.c on proc_comm based platforms Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd [this message]
2013-12-30 21:15 ` [PATCH v2 5/7] ARM: msm: Only build timer.c if required Stephen Boyd
2013-12-30 21:15 ` [PATCH v2 6/7] drm/msm: Drop unnecessary mach include Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2013-12-30 21:20 ` Stephen Boyd
2013-12-30 21:20 ` Stephen Boyd
2013-12-31 1:12 ` Rob Clark
2013-12-31 1:12 ` Rob Clark
2013-12-31 1:12 ` Rob Clark
2013-12-31 1:19 ` Rob Clark
2013-12-31 1:19 ` Rob Clark
2013-12-31 1:19 ` Rob Clark
2013-12-31 5:15 ` Stephen Boyd
2013-12-31 5:15 ` Stephen Boyd
2013-12-31 5:15 ` Stephen Boyd
2014-01-09 8:13 ` Olof Johansson
2014-01-09 8:13 ` Olof Johansson
2014-01-09 8:13 ` Olof Johansson
2014-01-09 18:40 ` Stephen Boyd
2014-01-09 18:40 ` Stephen Boyd
2014-01-09 18:40 ` Stephen Boyd
2013-12-30 21:15 ` [PATCH v2 7/7] ARM: msm: Move MSM's DT based hardware to multi-platform support Stephen Boyd
2013-12-30 21:15 ` Stephen Boyd
2013-12-30 21:17 ` [PATCH v2 0/7] Allow MSM DT platforms to be built multi-platform Stephen Boyd
2013-12-30 21:17 ` Stephen Boyd
2014-01-02 18:13 ` Arnd Bergmann
2014-01-02 18:13 ` Arnd Bergmann
2014-01-03 18:51 ` Stephen Boyd
2014-01-03 18:51 ` Stephen Boyd
2014-01-03 19:31 ` Olof Johansson
2014-01-03 19:31 ` Olof Johansson
2014-01-03 19:31 ` Olof Johansson
2014-01-09 8:11 ` Olof Johansson
2014-01-09 8:11 ` Olof Johansson
2014-01-09 8:11 ` Olof Johansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1388438133-431-6-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=arm@kernel.org \
--cc=davidb@codeaurora.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.