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 6664f1108c7c2f8c54a3d1d0f32f6c1c7f622bb3..0e22f241403bc1ce4da1e8abd5f33f6fde2ff1d4 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -10,7 +10,7 @@ config ARM_PSCI_FW
 
 config ARM_SCPI_PROTOCOL
        tristate "ARM System Control and Power Interface (SCPI) Message Protocol"
 
 config ARM_SCPI_PROTOCOL
        tristate "ARM System Control and Power Interface (SCPI) Message Protocol"

-       depends on ARM_MHU
+       depends on MAILBOX

        help
          System Control and Power Interface (SCPI) Message Protocol is
          defined for the purpose of communication between the Application
        help
          System Control and Power Interface (SCPI) Message Protocol is
          defined for the purpose of communication between the Application


@@ -27,6 +27,15 @@ config ARM_SCPI_PROTOCOL
          This protocol library provides interface for all the client drivers
          making use of the features offered by the SCP.
 
          This protocol library provides interface for all the client drivers
          making use of the features offered by the SCP.
 

+config ARM_SCPI_POWER_DOMAIN
+       tristate "SCPI power domain driver"
+       depends on ARM_SCPI_PROTOCOL || (COMPILE_TEST && OF)
+       default y
+       select PM_GENERIC_DOMAINS if PM
+       help
+         This enables support for the SCPI power domains which can be
+         enabled or disabled via the SCP firmware
+

 config EDD
        tristate "BIOS Enhanced Disk Drive calls determine boot disk"
        depends on X86
 config EDD
        tristate "BIOS Enhanced Disk Drive calls determine boot disk"
        depends on X86


@@ -184,6 +193,7 @@ config FW_CFG_SYSFS_CMDLINE
 config QCOM_SCM
        bool
        depends on ARM || ARM64
 config QCOM_SCM
        bool
        depends on ARM || ARM64

+       select RESET_CONTROLLER

 
 config QCOM_SCM_32
        def_bool y
 
 config QCOM_SCM_32
        def_bool y