Merge tag 'zynqmp-soc-fixes-for-4.16' of https://github.com/Xilinx/linux-xlnx into next/drivers (9db16401) · Commits · 戴 / test

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

drivers/soc/xilinx/Kconfig

+11 −10

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@ menu "Xilinx SoC drivers"

		config XILINX_VCU
		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

drivers/soc/xilinx/xlnx_vcu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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;

Admin message