Commit d387dfc4 authored by Michael Tretter's avatar Michael Tretter Committed by Stephen Boyd
Browse files

soc: xilinx: vcu: drop coreclk from struct xlnx_vcu 



The coreclk field is newer read after being written to xlnx_vcu. Remove
the coreclk field from the xlnx_vcu and use a function local variable
instead.

Signed-off-by: default avatarMichael Tretter <m.tretter@pengutronix.de>
Acked-by: default avatarMichal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20210121071659.1226489-4-m.tretter@pengutronix.de


Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent 0225daea

drivers/soc/xilinx/xlnx_vcu.c

+2 −4
Original line number Diff line number Diff line
@@ -73,7 +73,6 @@ 
 * @aclk: axi clock source

 * @logicore_reg_ba: logicore reg base address

 * @vcu_slcr_ba: vcu_slcr Register base address

 * @coreclk: core clock frequency

 */

struct xvcu_device {

	struct device *dev;
@@ -81,7 +80,6 @@ struct xvcu_device { 
	struct clk *aclk;

	struct regmap *logicore_reg_ba;

	void __iomem *vcu_slcr_ba;

	u32 coreclk;

};



static struct regmap_config vcu_settings_regmap_config = {
@@ -358,10 +356,10 @@ static int xvcu_set_vcu_pll_info(struct xvcu_device *xvcu) 
		return -EINVAL;

	}



	xvcu->coreclk = pll_clk / divisor_core;

	coreclk = pll_clk / divisor_core;

	mcuclk = pll_clk / divisor_mcu;

	dev_dbg(xvcu->dev, "Actual Ref clock freq is %uHz\n", refclk);

	dev_dbg(xvcu->dev, "Actual Core clock freq is %uHz\n", xvcu->coreclk);

	dev_dbg(xvcu->dev, "Actual Core clock freq is %uHz\n", coreclk);

	dev_dbg(xvcu->dev, "Actual Mcu clock freq is %uHz\n", mcuclk);



	vcu_pll_ctrl &= ~(VCU_PLL_CTRL_FBDIV_MASK << VCU_PLL_CTRL_FBDIV_SHIFT);