Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ARM: qcom: drop most of 32-bit ARCH_QCOM subtypes

Historically we had several subtypes of 32-bit Qualcomm platforms.
Nowadays they became just useless symbols in Kconfig. Drop them and pull
corresponding clocksource entries towards top-level ARCH_QCOM entry.

Note, I've left ARCH_IPQ40XX, ARCH_MSM8x60 and ARCH_MSM8960 in place,
since they have special TEXT_OFFSET handling, which can be sorted out
separately.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Link: https://lore.kernel.org/r/20231216162700.863456-3-dmitry.baryshkov@linaro.org
Signed-off-by: Bjorn Andersson <andersson@kernel.org>

authored by

Dmitry Baryshkov and committed by
Bjorn Andersson
85148df3 18368ee2

+4 -26
+4 -26
arch/arm/mach-qcom/Kconfig
··· 4 4 depends on ARCH_MULTI_V7 5 5 select ARM_GIC 6 6 select ARM_AMBA 7 + select CLKSRC_QCOM 8 + select HAVE_ARM_ARCH_TIMER 7 9 select PINCTRL 8 10 select QCOM_SCM if SMP 9 11 help 10 12 Support for Qualcomm's devicetree based systems. 13 + This includes support for a few devices with ARM64 SoC, that have 14 + ARM32 signed firmware that does not allow booting ARM64 kernels. 11 15 12 16 if ARCH_QCOM 13 17 14 18 config ARCH_IPQ40XX 15 19 bool "Enable support for IPQ40XX" 16 - select CLKSRC_QCOM 17 - select HAVE_ARM_ARCH_TIMER 18 20 19 21 config ARCH_MSM8X60 20 22 bool "Enable support for MSM8X60" 21 - select CLKSRC_QCOM 22 - 23 - config ARCH_MSM8909 24 - bool "Enable support for MSM8909" 25 - select HAVE_ARM_ARCH_TIMER 26 - 27 - config ARCH_MSM8916 28 - bool "Enable support for MSM8916" 29 - select HAVE_ARM_ARCH_TIMER 30 - help 31 - Enable support for the Qualcomm Snapdragon 410 (MSM8916/APQ8016). 32 - 33 - Note that ARM64 is the main supported architecture for MSM8916. 34 - The ARM32 option is intended for a few devices with signed firmware 35 - that does not allow booting ARM64 kernels. 36 23 37 24 config ARCH_MSM8960 38 25 bool "Enable support for MSM8960" 39 - select CLKSRC_QCOM 40 - 41 - config ARCH_MSM8974 42 - bool "Enable support for MSM8974" 43 - select HAVE_ARM_ARCH_TIMER 44 - 45 - config ARCH_MDM9615 46 - bool "Enable support for MDM9615" 47 - select CLKSRC_QCOM 48 26 49 27 endif