Merge tag 'mfd-next-5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd

[linux-block.git] / drivers / fpga / Kconfig

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
index 5ff9438b7b4611803aedf34ebc3e004a0be0de60..33e15058d0dc7a69f31363d248f9f2e2097c42a4 100644 (file)
--- a/drivers/fpga/Kconfig
+++ b/drivers/fpga/Kconfig
@@ -14,13 +14,13 @@ if FPGA
 
 config FPGA_MGR_SOCFPGA
        tristate "Altera SOCFPGA FPGA Manager"
-       depends on ARCH_SOCFPGA || COMPILE_TEST
+       depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST
        help
          FPGA manager driver support for Altera SOCFPGA.
 
 config FPGA_MGR_SOCFPGA_A10
        tristate "Altera SoCFPGA Arria10"
-       depends on ARCH_SOCFPGA || COMPILE_TEST
+       depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST
        select REGMAP_MMIO
        help
          FPGA manager driver support for Altera Arria10 SoCFPGA.
@@ -60,7 +60,7 @@ config FPGA_MGR_ZYNQ_FPGA
 
 config FPGA_MGR_STRATIX10_SOC
        tristate "Intel Stratix10 SoC FPGA Manager"
-       depends on (ARCH_STRATIX10 && INTEL_STRATIX10_SERVICE)
+       depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE)
        help
          FPGA manager driver support for the Intel Stratix10 SoC.
 
@@ -99,7 +99,7 @@ config FPGA_BRIDGE
 
 config SOCFPGA_FPGA_BRIDGE
        tristate "Altera SoCFPGA FPGA Bridges"
-       depends on ARCH_SOCFPGA && FPGA_BRIDGE
+       depends on ARCH_INTEL_SOCFPGA && FPGA_BRIDGE
        help
          Say Y to enable drivers for FPGA bridges for Altera SOCFPGA
          devices.
@@ -118,10 +118,17 @@ config XILINX_PR_DECOUPLER
        depends on FPGA_BRIDGE
        depends on HAS_IOMEM
        help
-         Say Y to enable drivers for Xilinx LogiCORE PR Decoupler.
+         Say Y to enable drivers for Xilinx LogiCORE PR Decoupler
+         or Xilinx Dynamic Function eXchnage AIX Shutdown Manager.
          The PR Decoupler exists in the FPGA fabric to isolate one
          region of the FPGA from the busses while that region is
          being reprogrammed during partial reconfig.
+         The Dynamic Function eXchange AXI shutdown manager prevents
+         AXI traffic from passing through the bridge. The controller
+         safely handles AXI4MM and AXI4-Lite interfaces on a
+         Reconfigurable Partition when it is undergoing dynamic
+         reconfiguration, preventing the system deadlock that can
+         occur if AXI transactions are interrupted by DFX.
 
 config FPGA_REGION
        tristate "FPGA Region"