Skip to content

Commit ba65a4e

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: "This is entirely SoC clk drivers. The majority diff wise is for the new Rockchip and Qualcomm clk drivers which is mostly lines and lines of data structures to describe the clk hardware in these SoCs. Beyond those two, Renesas continues to incrementally add clks to their SoC drivers, causing them to show up higher in the diffstat this time because they added quite a few clks all over the place. Overall it is a semi-quiet release that has some new clk drivers and the usual fixes for clock data that was wrong or missing and non-critical cleanups that plug error paths or fix typos. New Drivers: - Qualcomm IPQ5424 Network Subsystem Clock Controller - Qualcomm SM8750 Video Clock Controller - Rockchip RV1126B and RK3506 clock drivers - i.MX8ULP SIM LPAV clock driver - Samsung ACPM (firmware interface) clock driver - Altera Agilex5 clock driver" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (117 commits) clk: keystone: fix compile testing clk: keystone: syscon-clk: fix regmap leak on probe failure clk: qcom: Mark camcc_sm7150_hws static clk: samsung: exynos-clkout: Assign .num before accessing .hws clk: rockchip: Add clock and reset driver for RK3506 dt-bindings: clock: rockchip: Add RK3506 clock and reset unit clk: actions: Fix discarding const qualifier by 'container_of' macro clk: spacemit: Set clk_hw_onecell_data::num before using flex array clk: visconti: Add VIIF clocks dt-bindings: clock: tmpv770x: Add VIIF clocks dt-bindings: clock: tmpv770x: Remove definition of number of clocks clk: visconti: Do not define number of clocks in bindings clk: rockchip: Add clock controller for the RV1126B dt-bindings: clock, reset: Add support for rv1126b clk: rockchip: Implement rockchip_clk_register_armclk_multi_pll() clk: qcom: x1e80100-dispcc: Add USB4 router link resets dt-bindings: clock: qcom: x1e80100-dispcc: Add USB4 router link resets clk: qcom: videocc-sm8750: Add video clock controller driver for SM8750 dt-bindings: clock: qcom: Add SM8750 video clock controller clk: qcom: branch: Extend invert logic for branch2 mem clocks ...
2 parents 67a454e + 6f17217 commit ba65a4e

125 files changed

Lines changed: 10600 additions & 368 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: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,6 @@ allOf:
6464
reg:
6565
minItems: 2
6666

67-
'#reset-cells': false
68-
6967
- if:
7068
properties:
7169
compatible:
@@ -85,6 +83,7 @@ examples:
8583
reg = <0x1fa20000 0x400>,
8684
<0x1fb00000 0x1000>;
8785
#clock-cells = <1>;
86+
#reset-cells = <1>;
8887
};
8988
9089
- |
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/fsl,imx8ulp-sim-lpav.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: NXP i.MX8ULP LPAV System Integration Module (SIM)
8+
9+
maintainers:
10+
- Laurentiu Mihalcea <laurentiu.mihalcea@nxp.com>
11+
12+
description:
13+
The i.MX8ULP LPAV subsystem contains a block control module known as
14+
SIM LPAV, which offers functionalities such as clock gating or reset
15+
line assertion/de-assertion.
16+
17+
properties:
18+
compatible:
19+
const: fsl,imx8ulp-sim-lpav
20+
21+
reg:
22+
maxItems: 1
23+
24+
clocks:
25+
maxItems: 3
26+
27+
clock-names:
28+
items:
29+
- const: bus
30+
- const: core
31+
- const: plat
32+
33+
'#clock-cells':
34+
const: 1
35+
36+
'#reset-cells':
37+
const: 1
38+
39+
mux-controller:
40+
$ref: /schemas/mux/reg-mux.yaml#
41+
42+
required:
43+
- compatible
44+
- reg
45+
- clocks
46+
- clock-names
47+
- '#clock-cells'
48+
- '#reset-cells'
49+
- mux-controller
50+
51+
additionalProperties: false
52+
53+
examples:
54+
- |
55+
#include <dt-bindings/clock/imx8ulp-clock.h>
56+
57+
clock-controller@2da50000 {
58+
compatible = "fsl,imx8ulp-sim-lpav";
59+
reg = <0x2da50000 0x10000>;
60+
clocks = <&cgc2 IMX8ULP_CLK_LPAV_BUS_DIV>,
61+
<&cgc2 IMX8ULP_CLK_HIFI_DIVCORE>,
62+
<&cgc2 IMX8ULP_CLK_HIFI_DIVPLAT>;
63+
clock-names = "bus", "core", "plat";
64+
#clock-cells = <1>;
65+
#reset-cells = <1>;
66+
67+
mux-controller {
68+
compatible = "reg-mux";
69+
#mux-control-cells = <1>;
70+
mux-reg-masks = <0x8 0x00000200>;
71+
};
72+
};

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ properties:
4646
"#clock-cells":
4747
const: 1
4848

49+
power-domains:
50+
maxItems: 1
51+
4952
reg:
5053
maxItems: 1
5154

Documentation/devicetree/bindings/clock/microchip,mpfs-clkcfg.yaml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,23 @@ properties:
2222
const: microchip,mpfs-clkcfg
2323

2424
reg:
25-
items:
26-
- description: |
27-
clock config registers:
28-
These registers contain enable, reset & divider tables for the, cpu,
29-
axi, ahb and rtc/mtimer reference clocks as well as enable and reset
30-
for the peripheral clocks.
31-
- description: |
32-
mss pll dri registers:
33-
Block of registers responsible for dynamic reconfiguration of the mss
34-
pll
25+
oneOf:
26+
- items:
27+
- description: |
28+
clock config registers:
29+
These registers contain enable, reset & divider tables for the, cpu,
30+
axi, ahb and rtc/mtimer reference clocks as well as enable and reset
31+
for the peripheral clocks.
32+
- description: |
33+
mss pll dri registers:
34+
Block of registers responsible for dynamic reconfiguration of the mss
35+
pll
36+
deprecated: true
37+
- items:
38+
- description: |
39+
mss pll dri registers:
40+
Block of registers responsible for dynamic reconfiguration of the mss
41+
pll
3542
3643
clocks:
3744
maxItems: 1
@@ -69,11 +76,12 @@ examples:
6976
- |
7077
#include <dt-bindings/clock/microchip,mpfs-clock.h>
7178
soc {
72-
#address-cells = <2>;
73-
#size-cells = <2>;
74-
clkcfg: clock-controller@20002000 {
79+
#address-cells = <1>;
80+
#size-cells = <1>;
81+
82+
clkcfg: clock-controller@3E001000 {
7583
compatible = "microchip,mpfs-clkcfg";
76-
reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;
84+
reg = <0x3E001000 0x1000>;
7785
clocks = <&ref>;
7886
#clock-cells = <1>;
7987
};

Documentation/devicetree/bindings/clock/qcom,rpmhcc.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ properties:
1818
compatible:
1919
enum:
2020
- qcom,glymur-rpmh-clk
21+
- qcom,kaanapali-rpmh-clk
2122
- qcom,milos-rpmh-clk
2223
- qcom,qcs615-rpmh-clk
2324
- qcom,qdu1000-rpmh-clk

Documentation/devicetree/bindings/clock/qcom,sm8450-videocc.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Qualcomm Video Clock & Reset Controller on SM8450
88

99
maintainers:
10-
- Taniya Das <quic_tdas@quicinc.com>
10+
- Taniya Das <taniya.das@oss.qualcomm.com>
1111
- Jagadeesh Kona <quic_jkona@quicinc.com>
1212

1313
description: |
@@ -17,6 +17,7 @@ description: |
1717
See also:
1818
include/dt-bindings/clock/qcom,sm8450-videocc.h
1919
include/dt-bindings/clock/qcom,sm8650-videocc.h
20+
include/dt-bindings/clock/qcom,sm8750-videocc.h
2021
2122
properties:
2223
compatible:
@@ -25,6 +26,7 @@ properties:
2526
- qcom,sm8475-videocc
2627
- qcom,sm8550-videocc
2728
- qcom,sm8650-videocc
29+
- qcom,sm8750-videocc
2830
- qcom,x1e80100-videocc
2931

3032
clocks:
@@ -61,6 +63,7 @@ allOf:
6163
enum:
6264
- qcom,sm8450-videocc
6365
- qcom,sm8550-videocc
66+
- qcom,sm8750-videocc
6467
then:
6568
required:
6669
- required-opps

Documentation/devicetree/bindings/clock/qcom,sm8550-tcsr.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
items:
2626
- enum:
2727
- qcom,glymur-tcsr
28+
- qcom,kaanapali-tcsr
2829
- qcom,milos-tcsr
2930
- qcom,sar2130p-tcsr
3031
- qcom,sm8550-tcsr

Documentation/devicetree/bindings/clock/qcom,sm8750-gcc.yaml

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ description: |
1313
Qualcomm global clock control module provides the clocks, resets and power
1414
domains on SM8750
1515
16-
See also: include/dt-bindings/clock/qcom,sm8750-gcc.h
16+
See also:
17+
include/dt-bindings/clock/qcom,kaanapali-gcc.h
18+
include/dt-bindings/clock/qcom,sm8750-gcc.h
1719
1820
properties:
1921
compatible:
20-
const: qcom,sm8750-gcc
22+
enum:
23+
- qcom,kaanapali-gcc
24+
- qcom,sm8750-gcc
2125

2226
clocks:
2327
items:
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/rockchip,rk3506-cru.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip RK3506 Clock and Reset Unit (CRU)
8+
9+
maintainers:
10+
- Finley Xiao <finley.xiao@rock-chips.com>
11+
- Heiko Stuebner <heiko@sntech.de>
12+
13+
description:
14+
The RK3506 CRU generates the clock and also implements reset for SoC
15+
peripherals.
16+
17+
properties:
18+
compatible:
19+
const: rockchip,rk3506-cru
20+
21+
reg:
22+
maxItems: 1
23+
24+
"#clock-cells":
25+
const: 1
26+
27+
"#reset-cells":
28+
const: 1
29+
30+
clocks:
31+
maxItems: 1
32+
33+
clock-names:
34+
const: xin
35+
36+
required:
37+
- compatible
38+
- reg
39+
- "#clock-cells"
40+
- "#reset-cells"
41+
- clocks
42+
- clock-names
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
clock-controller@ff9a0000 {
49+
compatible = "rockchip,rk3506-cru";
50+
reg = <0xff9a0000 0x20000>;
51+
#clock-cells = <1>;
52+
#reset-cells = <1>;
53+
clocks = <&xin24m>;
54+
clock-names = "xin";
55+
};
Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/rockchip,rv1126b-cru.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip RV1126B Clock and Reset Unit
8+
9+
maintainers:
10+
- Elaine Zhang <zhangqing@rock-chips.com>
11+
- Heiko Stuebner <heiko@sntech.de>
12+
13+
description:
14+
The rv1126b clock controller generates the clock and also implements a
15+
reset controller for SoC peripherals.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- rockchip,rv1126b-cru
21+
22+
reg:
23+
maxItems: 1
24+
25+
"#clock-cells":
26+
const: 1
27+
28+
"#reset-cells":
29+
const: 1
30+
31+
clocks:
32+
maxItems: 1
33+
34+
clock-names:
35+
const: xin24m
36+
37+
required:
38+
- compatible
39+
- reg
40+
- "#clock-cells"
41+
- "#reset-cells"
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
clock-controller@20000000 {
48+
compatible = "rockchip,rv1126b-cru";
49+
reg = <0x20000000 0xc0000>;
50+
#clock-cells = <1>;
51+
#reset-cells = <1>;
52+
};

0 commit comments

Comments
 (0)