Merge tag 'zynqmp-soc-fixes-for-4.16' of https://github.com/Xilinx/linux-xlnx into...
authorArnd Bergmann <arnd@arndb.de>
Fri, 26 Jan 2018 16:33:36 +0000 (17:33 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 26 Jan 2018 16:33:36 +0000 (17:33 +0100)
commit9db16401d2d2e651fe1ca55ccb32e9bef402b411
tree2b44cc9cc86d312ad6f33e68ee44c7338e03010c
parentd43aeff392b5ba2b7cdf2ed13c2b0b0597f81977
parent056b54eeaebbe567076fe9e824643fc330cba4d5
Merge tag 'zynqmp-soc-fixes-for-4.16' of https://github.com/Xilinx/linux-xlnx into next/drivers

Pull "arm: Xilinx ZynqMP SoC fixes for v4.16" from Michal Simek:

- Fix Kconfig dependency
- Fix vcu clkoutdiv calculation

* tag 'zynqmp-soc-fixes-for-4.16' of https://github.com/Xilinx/linux-xlnx:
  soc: xilinx: Fix Kconfig alignment
  soc: xilinx: xlnx_vcu: Use bitwise & rather than logical && on clkoutdiv
  soc: xilinx: xlnx_vcu: Depends on HAS_IOMEM for xlnx_vcu