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>

diff --git a/arch/arm/mach-qcom/Kconfig b/arch/arm/mach-qcom/Kconfig
index 12a812e61c1639edbacfbe1f23550cabe15ed5e5..27d5ca0043be324c52d378ca92ec196c1f8bcd4f 100644 (file)
--- a/arch/arm/mach-qcom/Kconfig
+++ b/arch/arm/mach-qcom/Kconfig
@@ -4,46 +4,24 @@ menuconfig ARCH_QCOM
        depends on ARCH_MULTI_V7
        select ARM_GIC
        select ARM_AMBA
+       select CLKSRC_QCOM
+       select HAVE_ARM_ARCH_TIMER
        select PINCTRL
        select QCOM_SCM if SMP
        help
          Support for Qualcomm's devicetree based systems.
+         This includes support for a few devices with ARM64 SoC, that have
+         ARM32 signed firmware that does not allow booting ARM64 kernels.
 
 if ARCH_QCOM
 
 config ARCH_IPQ40XX
        bool "Enable support for IPQ40XX"
-       select CLKSRC_QCOM
-       select HAVE_ARM_ARCH_TIMER
 
 config ARCH_MSM8X60
        bool "Enable support for MSM8X60"
-       select CLKSRC_QCOM
-
-config ARCH_MSM8909
-       bool "Enable support for MSM8909"
-       select HAVE_ARM_ARCH_TIMER
-
-config ARCH_MSM8916
-       bool "Enable support for MSM8916"
-       select HAVE_ARM_ARCH_TIMER
-       help
-         Enable support for the Qualcomm Snapdragon 410 (MSM8916/APQ8016).
-
-         Note that ARM64 is the main supported architecture for MSM8916.
-         The ARM32 option is intended for a few devices with signed firmware
-         that does not allow booting ARM64 kernels.
 
 config ARCH_MSM8960
        bool "Enable support for MSM8960"
-       select CLKSRC_QCOM
-
-config ARCH_MSM8974
-       bool "Enable support for MSM8974"
-       select HAVE_ARM_ARCH_TIMER
-
-config ARCH_MDM9615
-       bool "Enable support for MDM9615"
-       select CLKSRC_QCOM
 
 endif