| Message ID | 20191202105809.4227-1-lee.jones@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | [5.3,1/1] clk: at91: fix update bit maps on CFG_MOR write | expand |
On Mon, Dec 02, 2019 at 10:58:09AM +0000, Lee Jones wrote: > From: Eugen Hristev <eugen.hristev@microchip.com> > > [ Upstream commit 263eaf8f172d9f44e15d6aca85fe40ec18d2c477 ] > > The regmap update bits call was not selecting the proper mask, considering > the bits which was updating. > Update the mask from call to also include OSCBYPASS. > Removed MOSCEN which was not updated. > > Fixes: 1bdf02326b71 ("clk: at91: make use of syscon/regmap internally") > Signed-off-by: Eugen Hristev <eugen.hristev@microchip.com> > Link: https://lkml.kernel.org/r/1568042692-11784-1-git-send-email-eugen.hristev@microchip.com > Acked-by: Alexandre Belloni <alexandre.belloni@bootlin.com> > Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com> > Signed-off-by: Stephen Boyd <sboyd@kernel.org> > Signed-off-by: Lee Jones <lee.jones@linaro.org> > --- > drivers/clk/at91/clk-main.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) queued up everywhere, thanks! greg k-h
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c index 311cea0c3ae2..87083b3a2769 100644 --- a/drivers/clk/at91/clk-main.c +++ b/drivers/clk/at91/clk-main.c @@ -156,7 +156,7 @@ at91_clk_register_main_osc(struct regmap *regmap, if (bypass) regmap_update_bits(regmap, AT91_CKGR_MOR, MOR_KEY_MASK | - AT91_PMC_MOSCEN, + AT91_PMC_OSCBYPASS, AT91_PMC_OSCBYPASS | AT91_PMC_KEY); hw = &osc->hw;