--- zzzz-none-000/linux-4.4.60/drivers/firmware/Kconfig	2017-04-08 07:53:53.000000000 +0000
+++ scorpion-7490-727/linux-4.4.60/drivers/firmware/Kconfig	2021-02-04 17:41:59.000000000 +0000
@@ -162,8 +162,9 @@
 	  Raspberry Pi.
 
 config QCOM_SCM
-	bool
+	def_bool y
 	depends on ARM || ARM64
+	select RESET_CONTROLLER
 
 config QCOM_SCM_32
 	def_bool y
@@ -173,6 +174,9 @@
 	def_bool y
 	depends on QCOM_SCM && ARM64
 
+config HAVE_ARM_SMCCC
+	bool
+
 source "drivers/firmware/broadcom/Kconfig"
 source "drivers/firmware/google/Kconfig"
 source "drivers/firmware/efi/Kconfig"