diff options
author | Linus Torvalds | 2024-08-16 16:59:05 -0700 |
---|---|---|
committer | Linus Torvalds | 2024-08-16 16:59:05 -0700 |
commit | 216595b708dac1707fc68d48042738d6d559ddd5 (patch) | |
tree | a0895b4e0221904efacb166e5951d5bd1ea1a45c | |
parent | 85652baa895b59b94bea29c77cb9b51cf7120deb (diff) | |
parent | 39a3396558fb97e6e7d4c1eb04c2166da31904a9 (diff) |
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
-rw-r--r-- | drivers/clk/thead/clk-th1520-ap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/thead/clk-th1520-ap.c b/drivers/clk/thead/clk-th1520-ap.c index cbc176b27c09..17e32ae08720 100644 --- a/drivers/clk/thead/clk-th1520-ap.c +++ b/drivers/clk/thead/clk-th1520-ap.c @@ -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), }, }; |