Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c97ec58 authored by Michal Simek's avatar Michal Simek Committed by Mike Turquette
Browse files

clk: zynq: Use clk_readl/clk_writel helper function 



Do not use readl/writel directly because the whole
clk subsystem is using clk_readl/clk_writel functions.

Signed-off-by: default avatarMichal Simek <michal.simek@xilinx.com>
Acked-by: default avatarSoren Brinkmann <soren.brinkmann@xilinx.com>
Signed-off-by: default avatarMike Turquette <mturquette@linaro.org>
parent 95aa4f9b

drivers/clk/zynq/clkc.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void __init zynq_clk_register_fclk(enum zynq_clk fclk, 
	clks[fclk] = clk_register_gate(NULL, clk_name,

			div1_name, CLK_SET_RATE_PARENT, fclk_gate_reg,

			0, CLK_GATE_SET_TO_DISABLE, fclk_gate_lock);

	enable_reg = readl(fclk_gate_reg) & 1;

	enable_reg = clk_readl(fclk_gate_reg) & 1;

	if (enable && !enable_reg) {

		if (clk_prepare_enable(clks[fclk]))

			pr_warn("%s: FCLK%u enable failed\n", __func__,
@@ -277,7 +277,7 @@ static void __init zynq_clk_setup(struct device_node *np) 
			SLCR_IOPLL_CTRL, 4, 1, 0, &iopll_lock);



	/* CPU clocks */

	tmp = readl(SLCR_621_TRUE) & 1;

	tmp = clk_readl(SLCR_621_TRUE) & 1;

	clk = clk_register_mux(NULL, "cpu_mux", cpu_parents, 4,

			CLK_SET_RATE_NO_REPARENT, SLCR_ARM_CLK_CTRL, 4, 2, 0,

			&armclk_lock);

drivers/clk/zynq/pll.c

+9 −9
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ static unsigned long zynq_pll_recalc_rate(struct clk_hw *hw, 
	 * makes probably sense to redundantly save fbdiv in the struct

	 * zynq_pll to save the IO access.

	 */

	fbdiv = (readl(clk->pll_ctrl) & PLLCTRL_FBDIV_MASK) >>

	fbdiv = (clk_readl(clk->pll_ctrl) & PLLCTRL_FBDIV_MASK) >>

			PLLCTRL_FBDIV_SHIFT;



	return parent_rate * fbdiv;
@@ -112,7 +112,7 @@ static int zynq_pll_is_enabled(struct clk_hw *hw) 


	spin_lock_irqsave(clk->lock, flags);



	reg = readl(clk->pll_ctrl);

	reg = clk_readl(clk->pll_ctrl);



	spin_unlock_irqrestore(clk->lock, flags);
@@ -138,10 +138,10 @@ static int zynq_pll_enable(struct clk_hw *hw) 
	/* Power up PLL and wait for lock */

	spin_lock_irqsave(clk->lock, flags);



	reg = readl(clk->pll_ctrl);

	reg = clk_readl(clk->pll_ctrl);

	reg &= ~(PLLCTRL_RESET_MASK | PLLCTRL_PWRDWN_MASK);

	writel(reg, clk->pll_ctrl);

	while (!(readl(clk->pll_status) & (1 << clk->lockbit)))

	clk_writel(reg, clk->pll_ctrl);

	while (!(clk_readl(clk->pll_status) & (1 << clk->lockbit)))

		;



	spin_unlock_irqrestore(clk->lock, flags);
@@ -168,9 +168,9 @@ static void zynq_pll_disable(struct clk_hw *hw) 
	/* shut down PLL */

	spin_lock_irqsave(clk->lock, flags);



	reg = readl(clk->pll_ctrl);

	reg = clk_readl(clk->pll_ctrl);

	reg |= PLLCTRL_RESET_MASK | PLLCTRL_PWRDWN_MASK;

	writel(reg, clk->pll_ctrl);

	clk_writel(reg, clk->pll_ctrl);



	spin_unlock_irqrestore(clk->lock, flags);

}
@@ -225,9 +225,9 @@ struct clk *clk_register_zynq_pll(const char *name, const char *parent, 


	spin_lock_irqsave(pll->lock, flags);



	reg = readl(pll->pll_ctrl);

	reg = clk_readl(pll->pll_ctrl);

	reg &= ~PLLCTRL_BPQUAL_MASK;

	writel(reg, pll->pll_ctrl);

	clk_writel(reg, pll->pll_ctrl);



	spin_unlock_irqrestore(pll->lock, flags);