Merge tag 'dt-5.15' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

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

diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig
index af6719c..220a58c 100644 (file)
--- a/drivers/firmware/Kconfig
+++ b/drivers/firmware/Kconfig
@@ -6,39 +6,7 @@
 
 menu "Firmware Drivers"
 
-config ARM_SCMI_PROTOCOL
-       tristate "ARM System Control and Management Interface (SCMI) Message Protocol"
-       depends on ARM || ARM64 || COMPILE_TEST
-       depends on MAILBOX
-       help
-         ARM System Control and Management Interface (SCMI) protocol is a
-         set of operating system-independent software interfaces that are
-         used in system management. SCMI is extensible and currently provides
-         interfaces for: Discovery and self-description of the interfaces
-         it supports, Power domain management which is the ability to place
-         a given device or domain into the various power-saving states that
-         it supports, Performance management which is the ability to control
-         the performance of a domain that is composed of compute engines
-         such as application processors and other accelerators, Clock
-         management which is the ability to set and inquire rates on platform
-         managed clocks and Sensor management which is the ability to read
-         sensor data, and be notified of sensor value.
-
-         This protocol library provides interface for all the client drivers
-         making use of the features offered by the SCMI.
-
-config ARM_SCMI_POWER_DOMAIN
-       tristate "SCMI power domain driver"
-       depends on ARM_SCMI_PROTOCOL || (COMPILE_TEST && OF)
-       default y
-       select PM_GENERIC_DOMAINS if PM
-       help
-         This enables support for the SCMI power domains which can be
-         enabled or disabled via the SCP firmware
-
-         This driver can also be built as a module.  If so, the module
-         will be called scmi_pm_domain. Note this may needed early in boot
-         before rootfs may be available.
+source "drivers/firmware/arm_scmi/Kconfig"
 
 config ARM_SCPI_PROTOCOL
        tristate "ARM System Control and Power Interface (SCPI) Message Protocol"
@@ -235,7 +203,7 @@ config INTEL_STRATIX10_RSU
          Say Y here if you want Intel RSU support.
 
 config QCOM_SCM
-       bool
+       tristate "Qcom SCM driver"
        depends on ARM || ARM64
        depends on HAVE_ARM_SMCCC
        select RESET_CONTROLLER
@@ -254,7 +222,7 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT
 config SYSFB
        bool
        default y
-       depends on X86 || ARM || ARM64 || RISCV || COMPILE_TEST
+       depends on X86 || EFI
 
 config SYSFB_SIMPLEFB
        bool "Mark VGA/VBE/EFI FB as generic system framebuffer"
@@ -328,6 +296,7 @@ config TURRIS_MOX_RWTM
          other manufacturing data and also utilize the Entropy Bit Generator
          for hardware random number generation.
 
+source "drivers/firmware/arm_ffa/Kconfig"
 source "drivers/firmware/broadcom/Kconfig"
 source "drivers/firmware/google/Kconfig"
 source "drivers/firmware/efi/Kconfig"