Commit a27748ad authored by Claudiu Beznea's avatar Claudiu Beznea Committed by Stephen Boyd
Browse files

clk: at91: clk-master: mask mckr against layout->mask 



Mask values read/written from/to MCKR against layout->mask as this
mask may be different b/w PMC versions.

Signed-off-by: default avatarClaudiu Beznea <claudiu.beznea@microchip.com>
Link: https://lore.kernel.org/r/20211011112719.3951784-10-claudiu.beznea@microchip.com


Acked-by: default avatarNicolas Ferre <nicolas.ferre@microchip.com>
Signed-off-by: default avatarStephen Boyd <sboyd@kernel.org>
parent c2910c00

drivers/clk/at91/clk-master.c

+5 −2
Original line number Diff line number Diff line
@@ -186,8 +186,8 @@ static int clk_master_div_set_rate(struct clk_hw *hw, unsigned long rate, 
	if (ret)

		goto unlock;



	tmp = mckr & master->layout->mask;

	tmp = (tmp >> MASTER_DIV_SHIFT) & MASTER_DIV_MASK;

	mckr &= master->layout->mask;

	tmp = (mckr >> MASTER_DIV_SHIFT) & MASTER_DIV_MASK;

	if (tmp == div)

		goto unlock;
@@ -384,6 +384,7 @@ static unsigned long clk_master_pres_recalc_rate(struct clk_hw *hw, 
	regmap_read(master->regmap, master->layout->offset, &val);

	spin_unlock_irqrestore(master->lock, flags);



	val &= master->layout->mask;

	pres = (val >> master->layout->pres_shift) & MASTER_PRES_MASK;

	if (pres == 3 && characteristics->have_div3_pres)

		pres = 3;
@@ -403,6 +404,8 @@ static u8 clk_master_pres_get_parent(struct clk_hw *hw) 
	regmap_read(master->regmap, master->layout->offset, &mckr);

	spin_unlock_irqrestore(master->lock, flags);



	mckr &= master->layout->mask;



	return mckr & AT91_PMC_CSS;

}