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

clk: imx: gate2: Remove the IMX_CLK_GATE2_SINGLE_BIT special case 



This was a hack which would allow multiple HW gates to be controlled
by a single bit. The only user of this is the imx_dev_clk_hw_gate_shared
which is not used anywhere as of now. Basically, complicates the logic
of the driver for no reason.

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 220175cd

drivers/clk/imx/clk-gate2.c

+7 −21
Original line number Diff line number Diff line
@@ -49,14 +49,10 @@ static int clk_gate2_enable(struct clk_hw *hw) 
	if (gate->share_count && (*gate->share_count)++ > 0)

		goto out;



	if (gate->flags & IMX_CLK_GATE2_SINGLE_BIT) {

		ret = clk_gate_ops.enable(hw);

	} else {

	reg = readl(gate->reg);

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

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

	writel(reg, gate->reg);

	}



out:

	spin_unlock_irqrestore(gate->lock, flags);
@@ -79,13 +75,9 @@ static void clk_gate2_disable(struct clk_hw *hw) 
			goto out;

	}



	if (gate->flags & IMX_CLK_GATE2_SINGLE_BIT) {

		clk_gate_ops.disable(hw);

	} else {

	reg = readl(gate->reg);

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

	writel(reg, gate->reg);

	}



out:

	spin_unlock_irqrestore(gate->lock, flags);
@@ -105,9 +97,6 @@ static int clk_gate2_is_enabled(struct clk_hw *hw) 
{

	struct clk_gate2 *gate = to_clk_gate2(hw);



	if (gate->flags & IMX_CLK_GATE2_SINGLE_BIT)

		return clk_gate_ops.is_enabled(hw);



	return clk_gate2_reg_is_enabled(gate->reg, gate->bit_idx);

}
@@ -117,9 +106,6 @@ static void clk_gate2_disable_unused(struct clk_hw *hw) 
	unsigned long flags;

	u32 reg;



	if (gate->flags & IMX_CLK_GATE2_SINGLE_BIT)

		return;



	spin_lock_irqsave(gate->lock, flags);



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

drivers/clk/imx/clk.h

+1 −4
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ 
#include <linux/spinlock.h>

#include <linux/clk-provider.h>



#define IMX_CLK_GATE2_SINGLE_BIT	1



extern spinlock_t imx_ccm_lock;



void imx_check_clocks(struct clk *clks[], unsigned int count);
@@ -384,8 +382,7 @@ static inline struct clk_hw *imx_dev_clk_hw_gate_shared(struct device *dev, 
				unsigned int *share_count)

{

	return clk_hw_register_gate2(NULL, name, parent, CLK_SET_RATE_PARENT |

					CLK_OPS_PARENT_ENABLE, reg, shift, 0x3,

					IMX_CLK_GATE2_SINGLE_BIT,

					CLK_OPS_PARENT_ENABLE, reg, shift, 0x1, 0,

					&imx_ccm_lock, share_count);

}