Skip to content

Commit 8895376

Browse files
committed
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
2 parents 1c892cd + cc976db commit 8895376

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Documentation/devicetree/bindings/clock/google,gs101-clock.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ allOf:
8585

8686
clock-names:
8787
items:
88-
- const: dout_cmu_misc_bus
89-
- const: dout_cmu_misc_sss
88+
- const: bus
89+
- const: sss
9090

9191
additionalProperties: false
9292

drivers/clk/samsung/clk-gs101.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2475,7 +2475,7 @@ static const struct samsung_cmu_info misc_cmu_info __initconst = {
24752475
.nr_clk_ids = CLKS_NR_MISC,
24762476
.clk_regs = misc_clk_regs,
24772477
.nr_clk_regs = ARRAY_SIZE(misc_clk_regs),
2478-
.clk_name = "dout_cmu_misc_bus",
2478+
.clk_name = "bus",
24792479
};
24802480

24812481
/* ---- platform_driver ----------------------------------------------------- */

0 commit comments

Comments
 (0)