提交 72ecebff 编写于 作者: E Eugen Hristev 提交者: Xie XiuQi

clk: at91: fix update bit maps on CFG_MOR write

commit 263eaf8f172d9f44e15d6aca85fe40ec18d2c477 upstream.

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: 1bdf0232 ("clk: at91: make use of syscon/regmap internally")
Signed-off-by: NEugen Hristev <eugen.hristev@microchip.com>
Link: https://lkml.kernel.org/r/1568042692-11784-1-git-send-email-eugen.hristev@microchip.comAcked-by: NAlexandre Belloni <alexandre.belloni@bootlin.com>
Reviewed-by: NClaudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: NStephen Boyd <sboyd@kernel.org>
Signed-off-by: NLee Jones <lee.jones@linaro.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 59bf857d
...@@ -162,7 +162,7 @@ at91_clk_register_main_osc(struct regmap *regmap, ...@@ -162,7 +162,7 @@ at91_clk_register_main_osc(struct regmap *regmap,
if (bypass) if (bypass)
regmap_update_bits(regmap, regmap_update_bits(regmap,
AT91_CKGR_MOR, MOR_KEY_MASK | AT91_CKGR_MOR, MOR_KEY_MASK |
AT91_PMC_MOSCEN, AT91_PMC_OSCBYPASS,
AT91_PMC_OSCBYPASS | AT91_PMC_KEY); AT91_PMC_OSCBYPASS | AT91_PMC_KEY);
hw = &osc->hw; hw = &osc->hw;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册