Commit 216595b7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux 

Pull clk fix from Stephen Boyd:
 "One fix for the new T-Head TH1520 clk driver that marks a bus clk
  critical so that it isn't turned off during late init which breaks
  emmc-sdio"

* tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux:
  clk: thead: fix dependency on clk_ignore_unused
parents 85652baa 39a33965

drivers/clk/thead/clk-th1520-ap.c

+1 −1
Original line number Diff line number Diff line
@@ -738,7 +738,7 @@ static struct ccu_div vp_axi_clk = { 
		.hw.init	= CLK_HW_INIT_PARENTS_HW("vp-axi",

					      video_pll_clk_parent,

					      &ccu_div_ops,

					      0),

					      CLK_IGNORE_UNUSED),

	},

};