From: Greg Kroah-Hartman Date: Mon, 2 Dec 2019 16:25:09 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v5.4.2~52 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=97c5c0511eae20c066504f6290abe9912c0068ba;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: clk-at91-fix-update-bit-maps-on-cfg_mor-write.patch --- diff --git a/queue-4.9/clk-at91-fix-update-bit-maps-on-cfg_mor-write.patch b/queue-4.9/clk-at91-fix-update-bit-maps-on-cfg_mor-write.patch new file mode 100644 index 00000000000..5e3509b1742 --- /dev/null +++ b/queue-4.9/clk-at91-fix-update-bit-maps-on-cfg_mor-write.patch @@ -0,0 +1,38 @@ +From 263eaf8f172d9f44e15d6aca85fe40ec18d2c477 Mon Sep 17 00:00:00 2001 +From: Eugen Hristev +Date: Mon, 9 Sep 2019 15:30:31 +0000 +Subject: clk: at91: fix update bit maps on CFG_MOR write + +From: Eugen Hristev + +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: 1bdf02326b71 ("clk: at91: make use of syscon/regmap internally") +Signed-off-by: Eugen Hristev +Link: https://lkml.kernel.org/r/1568042692-11784-1-git-send-email-eugen.hristev@microchip.com +Acked-by: Alexandre Belloni +Reviewed-by: Claudiu Beznea +Signed-off-by: Stephen Boyd +Signed-off-by: Lee Jones +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/clk/at91/clk-main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/clk/at91/clk-main.c ++++ b/drivers/clk/at91/clk-main.c +@@ -162,7 +162,7 @@ at91_clk_register_main_osc(struct 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; diff --git a/queue-4.9/series b/queue-4.9/series index c220f636998..b761ef1c9ae 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -103,3 +103,4 @@ scsi-libsas-check-smp-phy-control-function-result.patch powerpc-pseries-dlpar-fix-a-missing-check-in-dlpar_p.patch mtd-remove-a-debug-trace-in-mtdpart.c.patch mm-gup-add-missing-refcount-overflow-checks-on-x86-a.patch +clk-at91-fix-update-bit-maps-on-cfg_mor-write.patch