Remove ARCH_MSM* configs
v3 cover Remove ARCH_MSM* configs
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(-)
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 1/3 ARM: qcom: Make an option for qcom 'a-family' platforms
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.
--- arch/arm/Makefile | 3 +-- arch/arm/mach-qcom/Kconfig | 13 +++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-)
arch/arm/Makefile +1 -2
@@ -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
arch/arm/mach-qcom/Kconfig +13 -0
@@ -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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 2/3 ARM: qcom_defconfig: Enable HAVE_ARM_ARCH_TIMER
In reply to Stephen BoydEnable this config in the defconfig so that we can delete the selection logic surrounding it that exists in mach-qcom/Kconfig.
--- arch/arm/configs/qcom_defconfig | 1 + 1 file changed, 1 insertion(+)
arch/arm/configs/qcom_defconfig +1 -0
@@ -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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
PATCH v3 3/3 ARM: qcom: Drop ARCH_MSM* configs
In reply to Stephen BoydDrop these configs now that we select the clocksources we need via the defconfig.
--- arch/arm/mach-qcom/Kconfig | 12 ------------ 1 file changed, 12 deletions(-)
arch/arm/mach-qcom/Kconfig +0 -12
@@ -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
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 5 lines · 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.
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
Quoted 16 lines · Stephen Boyd
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 toQCOM_ARCH_A_FAMILYto be less confusingChanges from v1:
* Patch 1 replaced with one that moves config to mach-qcom/Kconfig
* Applied Arnd's acks to patches 2 and 3Stephen Boyd (3):
ARM: qcom: Make an option for qcom 'a-family' platforms
ARM:qcom_defconfig: EnableHAVE_ARM_ARCH_TIMER
ARM: qcom: Drop ARCH_MSM* configs
Quoted 4 lines
arch/arm/Makefile | 3 +-- arch/arm/configs/qcom_defconfig | 1 + arch/arm/mach-qcom/Kconfig | 17 +++++++++-------- 3 files changed, 11 insertions(+), 10 deletions(-)
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.
Signature · 5 lines
<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