Merge branches 'misc' and 'sa1111-base' into for-linus

[karo-tx-linux.git] / drivers / firmware / Kconfig

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index 4683bc375e9656efa30d2eeb17eaf89b8f4adf6d..0e22f241403bc1ce4da1e8abd5f33f6fde2ff1d4 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -29,10 +29,9 @@ config ARM_SCPI_PROTOCOL
 
 config ARM_SCPI_POWER_DOMAIN
        tristate "SCPI power domain driver"
-       depends on ARM_SCPI_PROTOCOL || COMPILE_TEST
+       depends on ARM_SCPI_PROTOCOL || (COMPILE_TEST && OF)
        default y
        select PM_GENERIC_DOMAINS if PM
-       select PM_GENERIC_DOMAINS_OF if PM
        help
          This enables support for the SCPI power domains which can be
          enabled or disabled via the SCP firmware
@@ -194,6 +193,7 @@ config FW_CFG_SYSFS_CMDLINE
 config QCOM_SCM
        bool
        depends on ARM || ARM64
+       select RESET_CONTROLLER
 
 config QCOM_SCM_32
        def_bool y