Patch "clk: bcm2835: Fix ana->maskX definitions" has been added to the 4.15-stable tree
Subsystems (4)
This is a note to let you know that I've just added the patch titled
clk: bcm2835: Fix ana->maskX definitions
to the 4.15-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
clk-bcm2835-fix-ana-maskx-definitions.patch
and it can be found in the queue-4.15 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
49012d1bf5f78782d398adb984a080a88ba42965Mon Sep 17 00:00:00 2001
From: Boris Brezillon <[email protected]>
Date: Thu, 8 Feb 2018 14:43:35 +0100
Subject: clk: bcm2835: Fix ana->maskX definitions
From: Boris Brezillon <[email protected]>
commit 49012d1bf5f78782d398adb984a080a88ba42965 upstream.
ana->maskX values are already '~'-ed in bcm2835_pll_set_rate(). Remove the '~' in the definition to fix ANA setup.
Note that this commit fixes a long standing bug preventing one from using an HDMI display if it's plugged after the FW has booted Linux. This is because PLLH is used by the HDMI encoder to generate the pixel clock.
--- drivers/clk/bcm/clk-bcm2835.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/clk/bcm/clk-bcm2835.c +4 -4
@@ -449,17 +449,17 @@ struct bcm2835_pll_ana_bits {static const struct bcm2835_pll_ana_bits bcm2835_ana_default = { .mask0 =0 , .set0 =0 , - .mask1 = (u32 )~(A2W_PLL_KI_MASK |A2W_PLL_KP_MASK ), + .mask1 =A2W_PLL_KI_MASK |A2W_PLL_KP_MASK , .set1 = (2 <<A2W_PLL_KI_SHIFT ) | (8 <<A2W_PLL_KP_SHIFT ), - .mask3 = (u32 )~A2W_PLL_KA_MASK , + .mask3 =A2W_PLL_KA_MASK , .set3 = (2 <<A2W_PLL_KA_SHIFT ), .fb_prediv_mask =BIT (14 ), };static const struct bcm2835_pll_ana_bits bcm2835_ana_pllh = { - .mask0 = (u32 )~(A2W_PLLH_KA_MASK |A2W_PLLH_KI_LOW_MASK ), + .mask0 =A2W_PLLH_KA_MASK |A2W_PLLH_KI_LOW_MASK , .set0 = (2 <<A2W_PLLH_KA_SHIFT ) | (2 <<A2W_PLLH_KI_LOW_SHIFT ), - .mask1 = (u32 )~(A2W_PLLH_KI_HIGH_MASK |A2W_PLLH_KP_MASK ), + .mask1 =A2W_PLLH_KI_HIGH_MASK |A2W_PLLH_KP_MASK , .set1 = (6 <<A2W_PLLH_KP_SHIFT ), .mask3 =0 , .set3 =0 ,
Patches currently in stable-queue which might be from [email protected] are
queue-4.15/clk-bcm2835-protect-sections-updating-shared-registers.patch queue-4.15/clk-bcm2835-fix-ana-maskx-definitions.patch