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

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
...@@ -738,7 +738,7 @@ static struct ccu_div vp_axi_clk = { ...@@ -738,7 +738,7 @@ static struct ccu_div vp_axi_clk = {
.hw.init = CLK_HW_INIT_PARENTS_HW("vp-axi", .hw.init = CLK_HW_INIT_PARENTS_HW("vp-axi",
video_pll_clk_parent, video_pll_clk_parent,
&ccu_div_ops, &ccu_div_ops,
0), CLK_IGNORE_UNUSED),
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment