summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaleb Connolly <[email protected]>2025-03-18 11:55:14 +0000
committerCaleb Connolly <[email protected]>2025-03-18 11:55:14 +0000
commitdcb6a5e7651f4a6cebfad4389119407e2a852783 (patch)
tree2be00f89569bb7ad7502315a7bf59c88afbdd4fd
parent38e14bacfced23c4618f222de77441a1355ff574 (diff)
mach-snapdragon: always select SYSRESET_PSCI for ARCH_SNAPDRAGON
Since removing reset_cpu() in mach-snapdragon, all Qualcomm platforms now depend on CONFIG_SYSRESET and will fail to build without it. Move the dependency from qcom_defconfig to kconfig so that we use SYSRESET for all platforms. Fixes: 61a1a1b8ca73 ("mach-snapdragon: use PSCI sysreset driver") Signed-off-by: Caleb Connolly <[email protected]>
-rw-r--r--arch/arm/Kconfig2
-rw-r--r--configs/qcom_defconfig2
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cf08fe63f1e..32b80da9869 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1117,6 +1117,8 @@ config ARCH_SNAPDRAGON
select OF_BOARD
select SAVE_PREV_BL_FDT_ADDR
select LINUX_KERNEL_IMAGE_HEADER if !ENABLE_ARM_SOC_BOOT0_HOOK
+ select SYSRESET
+ select SYSRESET_PSCI
imply OF_UPSTREAM
imply CMD_DM
diff --git a/configs/qcom_defconfig b/configs/qcom_defconfig
index 82bbdc99667..ba4d38d100e 100644
--- a/configs/qcom_defconfig
+++ b/configs/qcom_defconfig
@@ -121,8 +121,6 @@ CONFIG_QCOM_RPMH=y
CONFIG_SPMI_MSM=y
CONFIG_SYSINFO=y
CONFIG_SYSINFO_SMBIOS=y
-CONFIG_SYSRESET=y
-CONFIG_SYSRESET_PSCI=y
CONFIG_SYSRESET_QCOM_PSHOLD=y
CONFIG_USB=y
CONFIG_USB_XHCI_HCD=y