Commit 040adb5f authored by Abel Vesa's avatar Abel Vesa Committed by Shawn Guo
Browse files

clk: imx: gate2: Keep the register writing in on place 



Move all the register writing to the newly added clk_gate2_do_shared_clks
and call that everywhere need needed. Cleans up the code a little bit.

Signed-off-by: default avatarAbel Vesa <abel.vesa@nxp.com>
Reviewed-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: default avatarShawn Guo <shawnguo@kernel.org>
parent 12309428

drivers/clk/imx/clk-gate2.c

+16 −17
Original line number Diff line number Diff line
@@ -37,10 +37,21 @@ struct clk_gate2 { 


#define to_clk_gate2(_hw) container_of(_hw, struct clk_gate2, hw)



static int clk_gate2_enable(struct clk_hw *hw)

static void clk_gate2_do_shared_clks(struct clk_hw *hw, bool enable)

{

	struct clk_gate2 *gate = to_clk_gate2(hw);

	u32 reg;



	reg = readl(gate->reg);

	reg &= ~(3 << gate->bit_idx);

	if (enable)

		reg |= gate->cgr_val << gate->bit_idx;

	writel(reg, gate->reg);

}



static int clk_gate2_enable(struct clk_hw *hw)

{

	struct clk_gate2 *gate = to_clk_gate2(hw);

	unsigned long flags;

	int ret = 0;
@@ -49,11 +60,7 @@ static int clk_gate2_enable(struct clk_hw *hw) 
	if (gate->share_count && (*gate->share_count)++ > 0)

		goto out;



	reg = readl(gate->reg);

	reg &= ~(3 << gate->bit_idx);

	reg |= gate->cgr_val << gate->bit_idx;

	writel(reg, gate->reg);



	clk_gate2_do_shared_clks(hw, true);

out:

	spin_unlock_irqrestore(gate->lock, flags);
@@ -63,7 +70,6 @@ out: 
static void clk_gate2_disable(struct clk_hw *hw)

{

	struct clk_gate2 *gate = to_clk_gate2(hw);

	u32 reg;

	unsigned long flags;



	spin_lock_irqsave(gate->lock, flags);
@@ -75,10 +81,7 @@ static void clk_gate2_disable(struct clk_hw *hw) 
			goto out;

	}



	reg = readl(gate->reg);

	reg &= ~(3 << gate->bit_idx);

	writel(reg, gate->reg);



	clk_gate2_do_shared_clks(hw, false);

out:

	spin_unlock_irqrestore(gate->lock, flags);

}
@@ -104,15 +107,11 @@ static void clk_gate2_disable_unused(struct clk_hw *hw) 
{

	struct clk_gate2 *gate = to_clk_gate2(hw);

	unsigned long flags;

	u32 reg;



	spin_lock_irqsave(gate->lock, flags);



	if (!gate->share_count || *gate->share_count == 0) {

		reg = readl(gate->reg);

		reg &= ~(3 << gate->bit_idx);

		writel(reg, gate->reg);

	}

	if (!gate->share_count || *gate->share_count == 0)

		clk_gate2_do_shared_clks(hw, false);



	spin_unlock_irqrestore(gate->lock, flags);

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE