fpga: select FPGA_BRIDGE for 'Xilinx LogiCORE PR Decoupler' helper

The Xilinx LogiCORE PR Decoupler depends on the FPGA_BRIDGE always and hence select it explicitly to make sure that it will be available all the time when PR decoupler is enabled. Also with the existing xilinx_defconfig, FPGA_BRIDGE is getting selected through XILINX_AIE and disabling the XILINX_AIE will disable the bridge and there by disables PR decoupler. This patch address this issues by selecting FPGA_BRIDGE through PR decoupler config. Signed-off-by: Nava kishore Manne <[email protected]>
lbl96 · Mar 21, 2022 · 3325e94 · 3325e94
1 parent ae78bf6
commit 3325e94
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 3 deletions.
diff --git a/arch/arm/configs/xilinx_zynq_defconfig b/arch/arm/configs/xilinx_zynq_defconfig
@@ -210,7 +210,6 @@ CONFIG_RAS=y
 CONFIG_FPGA=y
 CONFIG_FPGA_MGR_ZYNQ_FPGA=y
 CONFIG_FPGA_MGR_ZYNQ_AFI_FPGA=y
-CONFIG_FPGA_BRIDGE=y
 CONFIG_XILINX_PR_DECOUPLER=y
 CONFIG_FPGA_REGION=y
 CONFIG_OF_FPGA_REGION=y

diff --git a/arch/arm64/configs/xilinx_zynqmp_defconfig b/arch/arm64/configs/xilinx_zynqmp_defconfig
@@ -365,7 +365,6 @@ CONFIG_ANDROID=y
 CONFIG_NVMEM_ZYNQMP=y
 CONFIG_FPGA=y
 CONFIG_XILINX_AFI_FPGA=y
-CONFIG_FPGA_BRIDGE=y
 CONFIG_XILINX_PR_DECOUPLER=y
 CONFIG_FPGA_REGION=y
 CONFIG_OF_FPGA_REGION=y

diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig
@@ -143,8 +143,8 @@ config ALTERA_FREEZE_BRIDGE
 
 config XILINX_PR_DECOUPLER
 	tristate "Xilinx LogiCORE PR Decoupler"
-	depends on FPGA_BRIDGE
 	depends on HAS_IOMEM
+	select FPGA_BRIDGE
 	help
 	  Say Y to enable drivers for Xilinx LogiCORE PR Decoupler
 	  or Xilinx Dynamic Function eXchange AIX Shutdown Manager.