Merge tag 'arm-soc/for-4.10/defconfig-fixes' of http://github.com/Broadcom/stblinux...

[linux-2.6-microblaze.git] / drivers / firmware / Kconfig

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index bca172d..1867f0d 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -8,6 +8,17 @@ menu "Firmware Drivers"
 config ARM_PSCI_FW
        bool
 
+config ARM_PSCI_CHECKER
+       bool "ARM PSCI checker"
+       depends on ARM_PSCI_FW && HOTPLUG_CPU && !TORTURE_TEST
+       help
+         Run the PSCI checker during startup. This checks that hotplug and
+         suspend operations work correctly when using PSCI.
+
+         The torture tests may interfere with the PSCI checker by turning CPUs
+         on and off through hotplug, so for now torture tests and PSCI checker
+         are mutually exclusive.
+
 config ARM_SCPI_PROTOCOL
        tristate "ARM System Control and Power Interface (SCPI) Message Protocol"
        depends on MAILBOX
@@ -203,6 +214,21 @@ config QCOM_SCM_64
        def_bool y
        depends on QCOM_SCM && ARM64
 
+config TI_SCI_PROTOCOL
+       tristate "TI System Control Interface (TISCI) Message Protocol"
+       depends on TI_MESSAGE_MANAGER
+       help
+         TI System Control Interface (TISCI) Message Protocol is used to manage
+         compute systems such as ARM, DSP etc with the system controller in
+         complex System on Chip(SoC) such as those found on certain keystone
+         generation SoC from TI.
+
+         System controller provides various facilities including power
+         management function support.
+
+         This protocol library is used by client drivers to use the features
+         provided by the system controller.
+
 config HAVE_ARM_SMCCC
        bool
 
@@ -210,5 +236,6 @@ source "drivers/firmware/broadcom/Kconfig"
 source "drivers/firmware/google/Kconfig"
 source "drivers/firmware/efi/Kconfig"
 source "drivers/firmware/meson/Kconfig"
+source "drivers/firmware/tegra/Kconfig"
 
 endmenu