summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2024-02-22 22:44:20 +0300
committerLinus Torvalds <torvalds@linux-foundation.org>2024-02-22 22:44:20 +0300
commit88953761b94df7dc9bfc46591a8975401689b057 (patch)
treeac0d7c13f82dd06132c76ea9d6cfa2920e082edc /drivers
parent1c892cdd8fe004ed6cef4501a7141594a1616368 (diff)
parentcc976dbc492c2bf67d8225845b609ea72e292128 (diff)
downloadlinux-88953761b94df7dc9bfc46591a8975401689b057.tar.xz
Merge tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk fixes from Stephen Boyd: "Here are some Samsung clk driver fixes I've been sitting on for far too long. They fix the bindings and clk driver for the Google GS101 SoC" * tag 'clk-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: clk: samsung: clk-gs101: comply with the new dt cmu_misc clock names dt-bindings: clock: gs101: rename cmu_misc clock-names
Diffstat (limited to 'drivers')
-rw-r--r--drivers/clk/samsung/clk-gs101.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/clk/samsung/clk-gs101.c b/drivers/clk/samsung/clk-gs101.c
index 0964bb11657f..782993951fff 100644
--- a/drivers/clk/samsung/clk-gs101.c
+++ b/drivers/clk/samsung/clk-gs101.c
@@ -2475,7 +2475,7 @@ static const struct samsung_cmu_info misc_cmu_info __initconst = {
.nr_clk_ids = CLKS_NR_MISC,
.clk_regs = misc_clk_regs,
.nr_clk_regs = ARRAY_SIZE(misc_clk_regs),
- .clk_name = "dout_cmu_misc_bus",
+ .clk_name = "bus",
};
/* ---- platform_driver ----------------------------------------------------- */