Commit 14479877 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 20b64cf8 52256736

drivers/clk/bcm/clk-raspberrypi.c

+7 −0
Original line number Diff line number Diff line
@@ -160,6 +160,13 @@ raspberrypi_clk_variants[RPI_FIRMWARE_NUM_CLK_ID] = { 
	[RPI_FIRMWARE_VEC_CLK_ID] = {

		.export = true,

		.minimize = true,



		/*

		 * If this clock is disabled during boot, it causes a bus

		 * lockup in RPi 3B. Therefore, make sure it's left enabled

		 * during boot.

		 */

		.flags = CLK_IGNORE_UNUSED,

	},

	[RPI_FIRMWARE_DISP_CLK_ID] = {

		.export = true,