soc: xilinx: vcu: drop coreclk from struct xlnx_vcu
authorMichael Tretter <m.tretter@pengutronix.de>
Thu, 21 Jan 2021 07:16:47 +0000 (08:16 +0100)
committerStephen Boyd <sboyd@kernel.org>
Tue, 9 Feb 2021 02:31:24 +0000 (18:31 -0800)
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: Michael Tretter <m.tretter@pengutronix.de>
Acked-by: Michal Simek <michal.simek@xilinx.com>
Link: https://lore.kernel.org/r/20210121071659.1226489-4-m.tretter@pengutronix.de
Signed-off-by: Stephen Boyd <sboyd@kernel.org>
drivers/soc/xilinx/xlnx_vcu.c

index 14daad4efc58fbb5666c301d9b4a91e963b847bb..7da9643820a81967ec5caff88dd0a3645b7ec873 100644 (file)
@@ -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);