Skip to content

Commit cc976db

Browse files
committed
Merge tag 'samsung-clk-fixes-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux into clk-fixes
Pull Samsung clk fixes from Krzysztof Kozlowski: Google GS101: Correct the input clock names to CMU MISC clock controller to match received review. The review was initially missed and CMU MISC clock controller bindings, driver and DTS was merged into v6.8-rc1 with different names. Nothing was released so far, so the bindings and driver can be still corrected to match review. * tag 'samsung-clk-fixes-6.8' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/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 6613476 + d76c762 commit cc976db

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)