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>,
Arnd Bergmann <arnd@arndb.de>
Subject: [PATCH v2 7/7] ARM: msm: Move MSM's DT based hardware to multi-platform support
Date: Mon, 30 Dec 2013 13:15:33 -0800 [thread overview]
Message-ID: <1388438133-431-8-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1388438133-431-1-git-send-email-sboyd@codeaurora.org>
The DT based MSM platforms can join the multi-platform builds, so
introduce a DT based ARCH_MSM option. This option allows DT based
MSM platforms to be built into the multi-platform kernel. Also
introduce a hidden ARCH_MSM config that both the DT and non-DT
platform support code select to avoid churn in places that depend
on CONFIG_ARCH_MSM.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
Arnd acked v1 but this is slightly different due to 8974 coming in.
arch/arm/Kconfig | 4 +--
arch/arm/mach-msm/Kconfig | 80 ++++++++++++++++++++++++-----------------------
2 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c1f1a7e..7803a13 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -631,10 +631,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
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index ff69e1c..9625cf3 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,12 +1,50 @@
+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"
@@ -45,41 +83,6 @@ config ARCH_QSD8X50
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
- select MSM_TIMER
-
-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
- select MSM_TIMER
-
-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
@@ -96,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
@@ -144,7 +147,6 @@ config MSM_SMD
config MSM_GPIOMUX
bool
- depends on !ARCH_MSM_DT
help
Support for MSM V1 TLMM GPIOMUX architecture.
--
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 7/7] ARM: msm: Move MSM's DT based hardware to multi-platform support
Date: Mon, 30 Dec 2013 13:15:33 -0800 [thread overview]
Message-ID: <1388438133-431-8-git-send-email-sboyd@codeaurora.org> (raw)
In-Reply-To: <1388438133-431-1-git-send-email-sboyd@codeaurora.org>
The DT based MSM platforms can join the multi-platform builds, so
introduce a DT based ARCH_MSM option. This option allows DT based
MSM platforms to be built into the multi-platform kernel. Also
introduce a hidden ARCH_MSM config that both the DT and non-DT
platform support code select to avoid churn in places that depend
on CONFIG_ARCH_MSM.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
Arnd acked v1 but this is slightly different due to 8974 coming in.
arch/arm/Kconfig | 4 +--
arch/arm/mach-msm/Kconfig | 80 ++++++++++++++++++++++++-----------------------
2 files changed, 43 insertions(+), 41 deletions(-)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index c1f1a7e..7803a13 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -631,10 +631,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
diff --git a/arch/arm/mach-msm/Kconfig b/arch/arm/mach-msm/Kconfig
index ff69e1c..9625cf3 100644
--- a/arch/arm/mach-msm/Kconfig
+++ b/arch/arm/mach-msm/Kconfig
@@ -1,12 +1,50 @@
+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"
@@ -45,41 +83,6 @@ config ARCH_QSD8X50
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
- select MSM_TIMER
-
-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
- select MSM_TIMER
-
-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
@@ -96,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
@@ -144,7 +147,6 @@ config MSM_SMD
config MSM_GPIOMUX
bool
- depends on !ARCH_MSM_DT
help
Support for MSM V1 TLMM GPIOMUX architecture.
--
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 ` [PATCH v2 5/7] ARM: msm: Only build timer.c if required Stephen Boyd
2013-12-30 21:15 ` 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 ` Stephen Boyd [this message]
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: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-8-git-send-email-sboyd@codeaurora.org \
--to=sboyd@codeaurora.org \
--cc=arm@kernel.org \
--cc=arnd@arndb.de \
--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.