Skip to content

Commit 1447987

Browse files
committed
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fix from Stephen Boyd: "One more fix for the merge window to avoid a boot hang on Raspberry Pi 3B by marking the VEC clk critical so that it doesn't get turned off and hang the bus" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: bcm: rpi: Mark VEC clock as CLK_IGNORE_UNUSED
2 parents 20b64cf + 5225673 commit 1447987

1 file changed

Lines changed: 7 additions & 0 deletions

File tree

drivers/clk/bcm/clk-raspberrypi.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,13 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NUM_CLK_ID] = {
160160
[RPI_FIRMWARE_VEC_CLK_ID] = {
161161
.export = true,
162162
.minimize = true,
163+
164+
/*
165+
* If this clock is disabled during boot, it causes a bus
166+
* lockup in RPi 3B. Therefore, make sure it's left enabled
167+
* during boot.
168+
*/
169+
.flags = CLK_IGNORE_UNUSED,
163170
},
164171
[RPI_FIRMWARE_DISP_CLK_ID] = {
165172
.export = true,

0 commit comments

Comments
 (0)