diff options
| author | Stephen Boyd <sboyd@kernel.org> | 2024-01-30 03:46:37 +0300 |
|---|---|---|
| committer | Stephen Boyd <sboyd@kernel.org> | 2024-01-30 03:47:05 +0300 |
| commit | cc976dbc492c2bf67d8225845b609ea72e292128 (patch) | |
| tree | 1b3735401caa5582c3e291bb4c543849f79eec20 | |
| parent | 6613476e225e090cc9aad49be7fa504e290dd33d (diff) | |
| parent | d76c762e7ee04af79e1c127422e0bbcb5f123018 (diff) | |
| download | linux-cc976dbc492c2bf67d8225845b609ea72e292128.tar.xz | |
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
| -rw-r--r-- | Documentation/devicetree/bindings/clock/google,gs101-clock.yaml | 4 | ||||
| -rw-r--r-- | drivers/clk/samsung/clk-gs101.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml b/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml index 3eebc03a309b..ca7fdada3ff2 100644 --- a/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml +++ b/Documentation/devicetree/bindings/clock/google,gs101-clock.yaml @@ -85,8 +85,8 @@ allOf: clock-names: items: - - const: dout_cmu_misc_bus - - const: dout_cmu_misc_sss + - const: bus + - const: sss additionalProperties: false 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 ----------------------------------------------------- */ |