Commit 8cb8f16c authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Geert Uytterhoeven
Browse files

clk: renesas: rcar-gen3: Factor out cpg_reg_modify() 



There's quite often repeated sequence of a CPG register read-modify-write,
so it seems worth factoring it out into a function -- this saves 68 bytes
of the object code (AArch64 gcc 4.8.5) and simplifies protecting all such
sequences with a spinlock in the next patch...

Signed-off-by: default avatarSergei Shtylyov <sergei.shtylyov@cogentembedded.com>
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
parent d9286d97

drivers/clk/renesas/rcar-gen3-cpg.c

+20 −18
Original line number Original line Diff line number Diff line
@@ -30,6 +30,16 @@ 




#define CPG_RCKCR_CKSEL	BIT(15)	/* RCLK Clock Source Select */

#define CPG_RCKCR_CKSEL	BIT(15)	/* RCLK Clock Source Select */





static void cpg_reg_modify(void __iomem *reg, u32 clear, u32 set)

{

	u32 val;



	val = readl(reg);

	val &= ~clear;

	val |= set;

	writel(val, reg);

};



struct cpg_simple_notifier {

struct cpg_simple_notifier {

	struct notifier_block nb;

	struct notifier_block nb;

	void __iomem *reg;

	void __iomem *reg;
@@ -118,7 +128,6 @@ static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate, 
	struct cpg_z_clk *zclk = to_z_clk(hw);

	struct cpg_z_clk *zclk = to_z_clk(hw);

	unsigned int mult;

	unsigned int mult;

	unsigned int i;

	unsigned int i;

	u32 val, kick;





	/* Factor of 2 is for fixed divider */

	/* Factor of 2 is for fixed divider */

	mult = DIV_ROUND_CLOSEST_ULL(rate * 32ULL * 2, parent_rate);

	mult = DIV_ROUND_CLOSEST_ULL(rate * 32ULL * 2, parent_rate);
@@ -127,17 +136,14 @@ static int cpg_z_clk_set_rate(struct clk_hw *hw, unsigned long rate, 
	if (readl(zclk->kick_reg) & CPG_FRQCRB_KICK)

	if (readl(zclk->kick_reg) & CPG_FRQCRB_KICK)

		return -EBUSY;

		return -EBUSY;





	val = readl(zclk->reg) & ~zclk->mask;

	cpg_reg_modify(zclk->reg, zclk->mask,

	val |= ((32 - mult) << __ffs(zclk->mask)) & zclk->mask;

		       ((32 - mult) << __ffs(zclk->mask)) & zclk->mask);

	writel(val, zclk->reg);





	/*

	/*

	 * Set KICK bit in FRQCRB to update hardware setting and wait for

	 * Set KICK bit in FRQCRB to update hardware setting and wait for

	 * clock change completion.

	 * clock change completion.

	 */

	 */

	kick = readl(zclk->kick_reg);

	cpg_reg_modify(zclk->kick_reg, 0, CPG_FRQCRB_KICK);

	kick |= CPG_FRQCRB_KICK;

	writel(kick, zclk->kick_reg);





	/*

	/*

	 * Note: There is no HW information about the worst case latency.

	 * Note: There is no HW information about the worst case latency.
@@ -266,12 +272,10 @@ static const struct sd_div_table cpg_sd_div_table[] = { 
static int cpg_sd_clock_enable(struct clk_hw *hw)

static int cpg_sd_clock_enable(struct clk_hw *hw)

{

{

	struct sd_clock *clock = to_sd_clock(hw);

	struct sd_clock *clock = to_sd_clock(hw);

	u32 val = readl(clock->csn.reg);





	val &= ~(CPG_SD_STP_MASK);

	cpg_reg_modify(clock->csn.reg, CPG_SD_STP_MASK,

	val |= clock->div_table[clock->cur_div_idx].val & CPG_SD_STP_MASK;

		       clock->div_table[clock->cur_div_idx].val &



		       CPG_SD_STP_MASK);

	writel(val, clock->csn.reg);





	return 0;

	return 0;

}

}
@@ -280,7 +284,7 @@ static void cpg_sd_clock_disable(struct clk_hw *hw) 
{

{

	struct sd_clock *clock = to_sd_clock(hw);

	struct sd_clock *clock = to_sd_clock(hw);





	writel(readl(clock->csn.reg) | CPG_SD_STP_MASK, clock->csn.reg);

	cpg_reg_modify(clock->csn.reg, 0, CPG_SD_STP_MASK);

}

}





static int cpg_sd_clock_is_enabled(struct clk_hw *hw)

static int cpg_sd_clock_is_enabled(struct clk_hw *hw)
@@ -327,7 +331,6 @@ static int cpg_sd_clock_set_rate(struct clk_hw *hw, unsigned long rate, 
{

{

	struct sd_clock *clock = to_sd_clock(hw);

	struct sd_clock *clock = to_sd_clock(hw);

	unsigned int div = cpg_sd_clock_calc_div(clock, rate, parent_rate);

	unsigned int div = cpg_sd_clock_calc_div(clock, rate, parent_rate);

	u32 val;

	unsigned int i;

	unsigned int i;





	for (i = 0; i < clock->div_num; i++)

	for (i = 0; i < clock->div_num; i++)
@@ -339,10 +342,9 @@ static int cpg_sd_clock_set_rate(struct clk_hw *hw, unsigned long rate, 




	clock->cur_div_idx = i;

	clock->cur_div_idx = i;





	val = readl(clock->csn.reg);

	cpg_reg_modify(clock->csn.reg, CPG_SD_STP_MASK | CPG_SD_FC_MASK,

	val &= ~(CPG_SD_STP_MASK | CPG_SD_FC_MASK);

		       clock->div_table[i].val &

	val |= clock->div_table[i].val & (CPG_SD_STP_MASK | CPG_SD_FC_MASK);

		       (CPG_SD_STP_MASK | CPG_SD_FC_MASK));

	writel(val, clock->csn.reg);





	return 0;

	return 0;

}

}