summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorEugen Hristev <eugen.hristev@microchip.com>2019-09-09 15:30:31 +0000
committerStephen Boyd <sboyd@kernel.org>2019-09-16 13:15:01 -0700
commit263eaf8f172d9f44e15d6aca85fe40ec18d2c477 (patch)
tree4d6b179873f6cbd1058ef55483f605c4e1fba865 /drivers/clk
parent5f9e832c137075045d15cd6899ab0505cfb2ca4b (diff)
downloadlinux-stable-263eaf8f172d9f44e15d6aca85fe40ec18d2c477.tar.gz
linux-stable-263eaf8f172d9f44e15d6aca85fe40ec18d2c477.tar.bz2
linux-stable-263eaf8f172d9f44e15d6aca85fe40ec18d2c477.zip
clk: at91: fix update bit maps on CFG_MOR write
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>
Diffstat (limited to 'drivers/clk')
-rw-r--r--drivers/clk/at91/clk-main.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/at91/clk-main.c b/drivers/clk/at91/clk-main.c
index f607ee702c83..ebe9b9998b40 100644
--- a/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@ -152,7 +152,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;