Skip to content

Commit 4ee6420

Browse files
committed
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk updates from Stephen Boyd: "We've finally gotten rid of the struct clk_ops::round_rate() code after months of effort from Brian Masney. Now the only option is to use determine_rate(), which is good because that takes a struct argument instead of just a couple unsigned longs, allowing us to easily modify the way we determine and set rates in the clk tree. Beyond that core framework change we've got the typical pile of new SoC clk driver additions, fixes for clk data and/or adding missing clks because the consumer driver using those clks wasn't ready, etc. The usual suspects are all here: Qualcomm, Samsung, Mediatek, and Rockchip along with some newcomers making RISC-V SoCs like ESWIN's eic700 and Tenstorrent's Atlantis. The clk driver side of this looks pretty normal. Core: - Remove the round_rate() clk op (yay!) New Drivers: - ESWIN eic700 SoC clk support - Econet EN751221 SoC clock/reset support - Global TCSR, RPMh, and display clock controller support for the Qualcomm Eliza platform - TCSR, the multiple global, and the RPMh clock controller support for the Qualcomm Nord platform - GPU clock controller support for Qualcomm SM8750 - Video and GPU clock controller support for Qualcomm Glymur - Global clock controller support for Qualcomm IPQ5210 - Axis ARTPEC-9: Add new PLL clocks and new drivers for eight clock controllers on the SoC - ExynosAutov920: Add G3D (GPU) clock controller - Clock driver for the Rockchip RV1103B SoC - Initial support for the Renesas RZ/G3L (R9A08G046) SoC - Clock and reset controllers (e.g. PRCM) in the Tenstorrent Atlantis SoC" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (132 commits) clk: visconti: pll: initialize clk_init_data to zero clk: fsl-sai: Add MCLK generation support clk: fsl-sai: Extract clock setup into fsl_sai_clk_register() dt-bindings: clock: fsl-sai: Document clock-cells = <1> support clk: fsl-sai: Add i.MX8M support with 8 byte register offset clk: fsl-sai: Sort the headers dt-bindings: clock: fsl-sai: Document i.MX8M support clk: qcom: gcc: Add multiple global clock controller driver for Nord SoC clk: qcom: rpmh: Add support for Nord rpmh clocks clk: qcom: Add TCSR clock driver for Nord SoC dt-bindings: clock: qcom: Add Nord Global Clock Controller dt-bindings: clock: qcom-rpmhcc: Add support for Nord SoCs dt-bindings: clock: qcom: Document the Nord SoC TCSR Clock Controller clk: qcom: gcc-x1e80100: Keep GCC USB QTB clock always ON clk: qcom: Constify list of critical CBCR registers clk: qcom: Constify qcom_cc_driver_data clk: qcom: videocc-glymur: Constify qcom_cc_desc clk: qcom: Add a driver for SM8750 GPU clocks dt-bindings: clock: qcom: Add SM8750 GPU clocks clk: qcom: ipq-cmn-pll: Add IPQ8074 SoC support ...
2 parents a85d6ff + 6b701fd commit 4ee6420

179 files changed

Lines changed: 24821 additions & 3464 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ properties:
3232
- enum:
3333
- airoha,en7523-scu
3434
- airoha,en7581-scu
35+
- econet,en751221-scu
3536

3637
reg:
3738
items:
@@ -67,7 +68,9 @@ allOf:
6768
- if:
6869
properties:
6970
compatible:
70-
const: airoha,en7581-scu
71+
enum:
72+
- airoha,en7581-scu
73+
- econet,en751221-scu
7174
then:
7275
properties:
7376
reg:
@@ -98,3 +101,4 @@ examples:
98101
#reset-cells = <1>;
99102
};
100103
};
104+

Documentation/devicetree/bindings/clock/baikal,bt1-ccu-div.yaml

Lines changed: 0 additions & 196 deletions
This file was deleted.

Documentation/devicetree/bindings/clock/baikal,bt1-ccu-pll.yaml

Lines changed: 0 additions & 131 deletions
This file was deleted.
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/eswin,eic7700-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Eswin EIC7700 SoC clock controller
8+
9+
maintainers:
10+
- Yifeng Huang <huangyifeng@eswincomputing.com>
11+
- Xuyang Dong <dongxuyang@eswincomputing.com>
12+
13+
description:
14+
The clock controller generates and supplies clock to all the modules
15+
for eic7700 SoC.
16+
17+
properties:
18+
compatible:
19+
const: eswin,eic7700-clock
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
items:
26+
- description: External 24MHz oscillator clock
27+
28+
'#clock-cells':
29+
const: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
- clocks
35+
- '#clock-cells'
36+
37+
additionalProperties: false
38+
39+
examples:
40+
- |
41+
clock-controller@51828000 {
42+
compatible = "eswin,eic7700-clock";
43+
reg = <0x51828000 0x300>;
44+
clocks = <&xtal24m>;
45+
#clock-cells = <1>;
46+
};

0 commit comments

Comments
 (0)