Commit e9801213 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'zynqmp-soc-for-v5.7-rc3' of https://github.com/Xilinx/linux-xlnx into arm/fixes

arm64: soc: ZynqMP SoC fixes for v5.7

- Fix firmware driver dependency
- Fix one spare warning in firmware driver

* tag 'zynqmp-soc-for-v5.7-rc3' of https://github.com/Xilinx/linux-xlnx:
  firmware: xilinx: make firmware_debugfs_root static
  drivers: soc: xilinx: fix firmware driver Kconfig dependency

Link: https://lore.kernel.org/r/4c6daeb0-bc61-8bdb-6ed6-5f58cd915326@monstr.euSigned-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d6b0a5b3 f5ba30ba
...@@ -35,7 +35,7 @@ static struct pm_api_info pm_api_list[] = { ...@@ -35,7 +35,7 @@ static struct pm_api_info pm_api_list[] = {
PM_API(PM_QUERY_DATA), PM_API(PM_QUERY_DATA),
}; };
struct dentry *firmware_debugfs_root; static struct dentry *firmware_debugfs_root;
/** /**
* zynqmp_pm_argument_value() - Extract argument value from a PM-API request * zynqmp_pm_argument_value() - Extract argument value from a PM-API request
......
...@@ -19,7 +19,7 @@ config XILINX_VCU ...@@ -19,7 +19,7 @@ config XILINX_VCU
config ZYNQMP_POWER config ZYNQMP_POWER
bool "Enable Xilinx Zynq MPSoC Power Management driver" bool "Enable Xilinx Zynq MPSoC Power Management driver"
depends on PM && ARCH_ZYNQMP depends on PM && ZYNQMP_FIRMWARE
default y default y
select MAILBOX select MAILBOX
select ZYNQMP_IPI_MBOX select ZYNQMP_IPI_MBOX
...@@ -35,7 +35,7 @@ config ZYNQMP_POWER ...@@ -35,7 +35,7 @@ config ZYNQMP_POWER
config ZYNQMP_PM_DOMAINS config ZYNQMP_PM_DOMAINS
bool "Enable Zynq MPSoC generic PM domains" bool "Enable Zynq MPSoC generic PM domains"
default y default y
depends on PM && ARCH_ZYNQMP && ZYNQMP_FIRMWARE depends on PM && ZYNQMP_FIRMWARE
select PM_GENERIC_DOMAINS select PM_GENERIC_DOMAINS
help help
Say yes to enable device power management through PM domains Say yes to enable device power management through PM domains
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment