summaryrefslogtreecommitdiffstats
path: root/drivers/soc
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2018-01-26 17:33:36 +0100
committerArnd Bergmann <arnd@arndb.de>2018-01-26 17:33:36 +0100
commit9db16401d2d2e651fe1ca55ccb32e9bef402b411 (patch)
tree2b44cc9cc86d312ad6f33e68ee44c7338e03010c /drivers/soc
parentd43aeff392b5ba2b7cdf2ed13c2b0b0597f81977 (diff)
parent056b54eeaebbe567076fe9e824643fc330cba4d5 (diff)
downloadlinux-9db16401d2d2e651fe1ca55ccb32e9bef402b411.tar.bz2
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
Diffstat (limited to 'drivers/soc')
-rw-r--r--drivers/soc/xilinx/Kconfig21
-rw-r--r--drivers/soc/xilinx/xlnx_vcu.c2
2 files changed, 12 insertions, 11 deletions
diff --git a/drivers/soc/xilinx/Kconfig b/drivers/soc/xilinx/Kconfig
index 266b50ffe349..687c8f3cd955 100644
--- a/drivers/soc/xilinx/Kconfig
+++ b/drivers/soc/xilinx/Kconfig
@@ -2,18 +2,19 @@
menu "Xilinx SoC drivers"
config XILINX_VCU
- tristate "Xilinx VCU logicoreIP Init"
- help
- Provides the driver to enable and disable the isolation between the
- processing system and programmable logic part by using the logicoreIP
- register set. This driver also configures the frequency based on the
- clock information from the logicoreIP register set.
+ tristate "Xilinx VCU logicoreIP Init"
+ depends on HAS_IOMEM
+ help
+ Provides the driver to enable and disable the isolation between the
+ processing system and programmable logic part by using the logicoreIP
+ register set. This driver also configures the frequency based on the
+ clock information from the logicoreIP register set.
- If you say yes here you get support for the logicoreIP.
+ If you say yes here you get support for the logicoreIP.
- If unsure, say N.
+ If unsure, say N.
- To compile this driver as a module, choose M here: the
- module will be called xlnx_vcu.
+ To compile this driver as a module, choose M here: the
+ module will be called xlnx_vcu.
endmenu
diff --git a/drivers/soc/xilinx/xlnx_vcu.c b/drivers/soc/xilinx/xlnx_vcu.c
index c1d6f1b190b6..a840c0272135 100644
--- a/drivers/soc/xilinx/xlnx_vcu.c
+++ b/drivers/soc/xilinx/xlnx_vcu.c
@@ -334,7 +334,7 @@ static int xvcu_set_vcu_pll_info(struct xvcu_device *xvcu)
*/
vcu_pll_ctrl = xvcu_read(xvcu->vcu_slcr_ba, VCU_PLL_CTRL);
clkoutdiv = vcu_pll_ctrl >> VCU_PLL_CTRL_CLKOUTDIV_SHIFT;
- clkoutdiv = clkoutdiv && VCU_PLL_CTRL_CLKOUTDIV_MASK;
+ clkoutdiv = clkoutdiv & VCU_PLL_CTRL_CLKOUTDIV_MASK;
if (clkoutdiv != 1) {
dev_err(xvcu->dev, "clkoutdiv value is invalid\n");
return -EINVAL;