* [PATCH v3 1/3] ARM: qcom: Make an option for qcom 'a-family' platforms
2015-12-01 1:25 [PATCH v3 0/3] Remove ARCH_MSM* configs Stephen Boyd
@ 2015-12-01 1:25 ` Stephen Boyd
2015-12-01 1:25 ` [PATCH v3 2/3] ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER Stephen Boyd
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2015-12-01 1:25 UTC (permalink / raw)
To: Andy Gross
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, Arnd Bergmann,
Daniel Lezcano
We want to remove the ARCH_MSM* configs in mach-qcom/Kconfig
because they are proxy configs for selecting the right
clocksource driver and adjusting the text offset and there is no
difference between ARCH_MSM8X60 and ARCH_MSM8960 anymore.
Furthermore, there aren't configs for all the SoCs supported by
the mainline kernel, leading to confusion about which SoCs are
supported.
So, add a new config that covers all the platforms that use the
qcom clocksource driver and need the 2MB text offset adjustment
and make it def_bool y so that the defconfigs keep working
properly.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/Makefile | 3 +--
arch/arm/mach-qcom/Kconfig | 13 +++++++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 2c2b28ee4811..dd5799dbcf26 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -148,8 +148,7 @@ textofs-$(CONFIG_PM_H1940) := 0x00108000
ifeq ($(CONFIG_ARCH_SA1100),y)
textofs-$(CONFIG_SA1111) := 0x00208000
endif
-textofs-$(CONFIG_ARCH_MSM8X60) := 0x00208000
-textofs-$(CONFIG_ARCH_MSM8960) := 0x00208000
+textofs-$(CONFIG_ARCH_QCOM_A_FAMILY) := 0x00208000
textofs-$(CONFIG_ARCH_AXXIA) := 0x00308000
# Machine directory name. This list is sorted alphanumerically
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index 2256cd1e25d1..230c7e8a32fb 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -10,6 +10,19 @@ menuconfig ARCH_QCOM
if ARCH_QCOM
+config ARCH_QCOM_A_FAMILY
+ bool "Support a-family chipsets (msm8660, msm8960, apq8064)"
+ default y
+ select CLKSRC_QCOM
+ help
+ Select this option if you want to support a-family platforms.
+
+ A-family includes all Snapdragon S1/S2/S3/S4 chips before 2013,
+ up to the MSM8x60 and APQ8064 SoCs.
+
+ B-family includes all Snapdragon 2xx/4xx/6xx/8xx models starting
+ in 2013 with the MSM8x74 SoC.
+
config ARCH_MSM8X60
bool "Enable support for MSM8X60"
select CLKSRC_QCOM
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 2/3] ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER
2015-12-01 1:25 [PATCH v3 0/3] Remove ARCH_MSM* configs Stephen Boyd
2015-12-01 1:25 ` [PATCH v3 1/3] ARM: qcom: Make an option for qcom 'a-family' platforms Stephen Boyd
@ 2015-12-01 1:25 ` Stephen Boyd
2015-12-01 1:25 ` [PATCH v3 3/3] ARM: qcom: Drop ARCH_MSM* configs Stephen Boyd
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2015-12-01 1:25 UTC (permalink / raw)
To: Andy Gross
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, Arnd Bergmann,
Daniel Lezcano
Enable this config in the defconfig so that we can delete the
selection logic surrounding it that exists in mach-qcom/Kconfig.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/configs/qcom_defconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/configs/qcom_defconfig b/arch/arm/configs/qcom_defconfig
index ee54a706e8a3..6f34da7afd75 100644
--- a/arch/arm/configs/qcom_defconfig
+++ b/arch/arm/configs/qcom_defconfig
@@ -22,6 +22,7 @@ CONFIG_ARCH_MSM8X60=y
CONFIG_ARCH_MSM8960=y
CONFIG_ARCH_MSM8974=y
CONFIG_SMP=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
CONFIG_PREEMPT=y
CONFIG_AEABI=y
CONFIG_HIGHMEM=y
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH v3 3/3] ARM: qcom: Drop ARCH_MSM* configs
2015-12-01 1:25 [PATCH v3 0/3] Remove ARCH_MSM* configs Stephen Boyd
2015-12-01 1:25 ` [PATCH v3 1/3] ARM: qcom: Make an option for qcom 'a-family' platforms Stephen Boyd
2015-12-01 1:25 ` [PATCH v3 2/3] ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER Stephen Boyd
@ 2015-12-01 1:25 ` Stephen Boyd
2015-12-01 11:50 ` [PATCH v3 0/3] Remove " Arnd Bergmann
2015-12-01 12:12 ` Daniel Lezcano
4 siblings, 0 replies; 6+ messages in thread
From: Stephen Boyd @ 2015-12-01 1:25 UTC (permalink / raw)
To: Andy Gross
Cc: linux-arm-msm, Daniel Lezcano, Arnd Bergmann, linux-kernel,
linux-arm-kernel
Drop these configs now that we select the clocksources we need
via the defconfig.
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>
---
arch/arm/mach-qcom/Kconfig | 12 ------------
1 file changed, 12 deletions(-)
diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index 230c7e8a32fb..9cd3b50d891f 100644
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -23,16 +23,4 @@ config ARCH_QCOM_A_FAMILY
B-family includes all Snapdragon 2xx/4xx/6xx/8xx models starting
in 2013 with the MSM8x74 SoC.
-config ARCH_MSM8X60
- bool "Enable support for MSM8X60"
- select CLKSRC_QCOM
-
-config ARCH_MSM8960
- bool "Enable support for MSM8960"
- select CLKSRC_QCOM
-
-config ARCH_MSM8974
- bool "Enable support for MSM8974"
- select HAVE_ARM_ARCH_TIMER
-
endif
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3 0/3] Remove ARCH_MSM* configs
2015-12-01 1:25 [PATCH v3 0/3] Remove ARCH_MSM* configs Stephen Boyd
` (2 preceding siblings ...)
2015-12-01 1:25 ` [PATCH v3 3/3] ARM: qcom: Drop ARCH_MSM* configs Stephen Boyd
@ 2015-12-01 11:50 ` Arnd Bergmann
2015-12-01 12:12 ` Daniel Lezcano
4 siblings, 0 replies; 6+ messages in thread
From: Arnd Bergmann @ 2015-12-01 11:50 UTC (permalink / raw)
To: linux-arm-kernel
Cc: Stephen Boyd, Andy Gross, linux-arm-msm, Daniel Lezcano,
linux-kernel
On Monday 30 November 2015 17:25:20 Stephen Boyd wrote:
> This patch series allows us to remove the ARCH_MSM* configs that live
> in mach-qcom/Kconfig. They're mostly proxy configs for user selectable
> clocksource configurations anyway.
>
>
Acked-by: Arnd Bergmann <arnd@arndb.de>
I suppose we could have a QCOM_B_FAMILY option as well, but it looks
like we don't need that. Maybe mention in the help text that B_FAMILY
is always supported.
Arnd
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH v3 0/3] Remove ARCH_MSM* configs
2015-12-01 1:25 [PATCH v3 0/3] Remove ARCH_MSM* configs Stephen Boyd
` (3 preceding siblings ...)
2015-12-01 11:50 ` [PATCH v3 0/3] Remove " Arnd Bergmann
@ 2015-12-01 12:12 ` Daniel Lezcano
4 siblings, 0 replies; 6+ messages in thread
From: Daniel Lezcano @ 2015-12-01 12:12 UTC (permalink / raw)
To: Stephen Boyd, Andy Gross
Cc: linux-kernel, linux-arm-msm, linux-arm-kernel, Arnd Bergmann
On 12/01/2015 02:25 AM, Stephen Boyd wrote:
> This patch series allows us to remove the ARCH_MSM* configs that live
> in mach-qcom/Kconfig. They're mostly proxy configs for user selectable
> clocksource configurations anyway.
>
> Changes from v2:
> * Renamed config in patch 1 to QCOM_ARCH_A_FAMILY to be less confusing
>
> Changes from v1:
> * Patch 1 replaced with one that moves config to mach-qcom/Kconfig
> * Applied Arnd's acks to patches 2 and 3
>
> Stephen Boyd (3):
> ARM: qcom: Make an option for qcom 'a-family' platforms
> ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER
> ARM: qcom: Drop ARCH_MSM* configs
>
> arch/arm/Makefile | 3 +--
> arch/arm/configs/qcom_defconfig | 1 +
> arch/arm/mach-qcom/Kconfig | 17 +++++++++--------
> 3 files changed, 11 insertions(+), 10 deletions(-)
Acked-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Even it does not hurt, ARCH_MSM8X60, ARCH_MSM8960 and ARCH_MSM8974 could
be also removed from the defconfig. Better to do it right now, so they
won't be forgotten.
--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs
Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog
^ permalink raw reply [flat|nested] 6+ messages in thread