Skip to content

Commit 9f3a2ba

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: "The core framework gained a clk provider helper, a clk consumer helper, and some unit tests for the assigned clk rates feature in DeviceTree. On the vendor driver side, we gained a whole pile of SoC driver support detailed below. The majority in the diffstat is Qualcomm, but there's also quite a few Samsung and Mediatek clk driver additions in here as well. The top vendors is quite common, but the sheer amount of new drivers is uncommon, so I'm anticipating a larger number of fixes for clk drivers this cycle. Core: - devm_clk_bulk_get_all_enabled() to return number of clks acquired - devm_clk_hw_register_gate_parent_hw() helper to modernize drivers - KUnit tests for clk-assigned-rates{,-u64} New Drivers: - Marvell PXA1908 SoC clks - Mobileye EyeQ5, EyeQ6L and EyeQ6H clk driver - TWL6030 clk driver - Nuvoton Arbel BMC NPCM8XX SoC clks - MediaTek MT6735 SoC clks - MediaTek MT7620, MT7628 and MT7688 MMC clks - Add a driver for gated fixed rate clocks - Global clock controllers for Qualcomm QCS8300 and IPQ5424 SoCs - Camera, display and video clock controllers for Qualcomm SA8775P SoCs - Global, display, GPU, TCSR, and RPMh clock controllers for Qualcomm SAR2130P - Global, camera, display, GPU, and video clock controllers for Qualcomm SM8475 SoCs - RTC power domain and Battery Backup Function (VBATTB) clock support for the Renesas RZ/G3S SoC - Qualcomm IPQ9574 alpha PLLs - Support for i.MX91 CCM in the i.MX93 driver - Microchip LAN969X SoC clks - Cortex-A55 core clocks and Interrupt Control Unit (ICU) clock and reset on Renesas RZ/V2H(P) - Samsung ExynosAutov920 clk drivers for PERIC1, MISC, HSI0 and HSI1 - Samsung Exynos8895 clk drivers for FSYS0/1, PERIC0/1, PERIS and TOP Updates: - Convert more clk bindings to YAML - Various clk driver cleanups: NULL checks, add const, etc. - Remove END/NUM #defines that count number of clks in various binding headers - Continue moving reset drivers to drivers/reset via auxiliary bus" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (162 commits) clk: clk-loongson2: Fix potential buffer overflow in flexible-array member access clk: Fix invalid execution of clk_set_rate clk: clk-loongson2: Fix memory corruption bug in struct loongson2_clk_provider clk: lan966x: make it selectable for ARCH_LAN969X clk: eyeq: add EyeQ6H west fixed factor clocks clk: eyeq: add EyeQ6H central fixed factor clocks clk: eyeq: add EyeQ5 fixed factor clocks clk: eyeq: add fixed factor clocks infrastructure clk: eyeq: require clock index with phandle in all cases clk: fixed-factor: add clk_hw_register_fixed_factor_index() function dt-bindings: clock: eyeq: add more Mobileye EyeQ5/EyeQ6H clocks dt-bindings: soc: mobileye: set `#clock-cells = <1>` for all compatibles clk: clk-axi-clkgen: make sure to enable the AXI bus clock dt-bindings: clock: axi-clkgen: include AXI clk clk: mmp: Add Marvell PXA1908 MPMU driver clk: mmp: Add Marvell PXA1908 APMU driver clk: mmp: Add Marvell PXA1908 APBCP driver clk: mmp: Add Marvell PXA1908 APBC driver dt-bindings: clock: Add Marvell PXA1908 clock bindings clk: mmp: Switch to use struct u32_fract instead of custom one ...
2 parents 2fb7eb3 + 21a5352 commit 9f3a2ba

File tree

242 files changed

+26300
-2133
lines changed

Some content is hidden

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

242 files changed

+26300
-2133
lines changed

Documentation/devicetree/bindings/clock/actions,owl-cmu.txt

Lines changed: 0 additions & 52 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/actions,owl-cmu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Actions Semi Owl Clock Management Unit (CMU)
8+
9+
maintainers:
10+
- Manivannan Sadhasivam <[email protected]>
11+
12+
description: |
13+
The Actions Semi Owl Clock Management Unit generates and supplies clock
14+
to various controllers within the SoC.
15+
16+
See also:
17+
include/dt-bindings/clock/actions,s500-cmu.h
18+
include/dt-bindings/clock/actions,s700-cmu.h
19+
include/dt-bindings/clock/actions,s900-cmu.h
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- actions,s500-cmu
25+
- actions,s700-cmu
26+
- actions,s900-cmu
27+
28+
reg:
29+
maxItems: 1
30+
31+
clocks:
32+
items:
33+
- description: Host oscillator source
34+
- description: Internal low frequency oscillator source
35+
36+
"#clock-cells":
37+
const: 1
38+
39+
"#reset-cells":
40+
const: 1
41+
42+
required:
43+
- compatible
44+
- reg
45+
- clocks
46+
- "#clock-cells"
47+
- "#reset-cells"
48+
49+
additionalProperties: false
50+
51+
examples:
52+
- |
53+
clock-controller@e0160000 {
54+
compatible = "actions,s900-cmu";
55+
reg = <0xe0160000 0x1000>;
56+
clocks = <&hosc>, <&losc>;
57+
#clock-cells = <1>;
58+
#reset-cells = <1>;
59+
};
60+
...

Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,21 @@ properties:
2626
description:
2727
Specifies the reference clock(s) from which the output frequency is
2828
derived. This must either reference one clock if only the first clock
29-
input is connected or two if both clock inputs are connected.
30-
minItems: 1
31-
maxItems: 2
29+
input is connected or two if both clock inputs are connected. The last
30+
clock is the AXI bus clock that needs to be enabled so we can access the
31+
core registers.
32+
minItems: 2
33+
maxItems: 3
34+
35+
clock-names:
36+
oneOf:
37+
- items:
38+
- const: clkin1
39+
- const: s_axi_aclk
40+
- items:
41+
- const: clkin1
42+
- const: clkin2
43+
- const: s_axi_aclk
3244

3345
'#clock-cells':
3446
const: 0
@@ -40,6 +52,7 @@ required:
4052
- compatible
4153
- reg
4254
- clocks
55+
- clock-names
4356
- '#clock-cells'
4457

4558
additionalProperties: false
@@ -50,5 +63,6 @@ examples:
5063
compatible = "adi,axi-clkgen-2.00.a";
5164
#clock-cells = <0>;
5265
reg = <0xff000000 0x1000>;
53-
clocks = <&osc 1>;
66+
clocks = <&osc 1>, <&clkc 15>;
67+
clock-names = "clkin1", "s_axi_aclk";
5468
};

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

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,10 @@ properties:
3434
- airoha,en7581-scu
3535

3636
reg:
37-
minItems: 2
38-
maxItems: 4
37+
items:
38+
- description: scu base address
39+
- description: misc scu base address
40+
minItems: 1
3941

4042
"#clock-cells":
4143
description:
@@ -60,9 +62,7 @@ allOf:
6062
then:
6163
properties:
6264
reg:
63-
items:
64-
- description: scu base address
65-
- description: misc scu base address
65+
minItems: 2
6666

6767
'#reset-cells': false
6868

@@ -73,11 +73,7 @@ allOf:
7373
then:
7474
properties:
7575
reg:
76-
items:
77-
- description: scu base address
78-
- description: misc scu base address
79-
- description: reset base address
80-
- description: pb scu base address
76+
maxItems: 1
8177

8278
additionalProperties: false
8379

@@ -96,12 +92,9 @@ examples:
9692
#address-cells = <2>;
9793
#size-cells = <2>;
9894
99-
scuclk: clock-controller@1fa20000 {
95+
scuclk: clock-controller@1fb00000 {
10096
compatible = "airoha,en7581-scu";
101-
reg = <0x0 0x1fa20000 0x0 0x400>,
102-
<0x0 0x1fb00000 0x0 0x90>,
103-
<0x0 0x1fb00830 0x0 0x8>,
104-
<0x0 0x1fbe3400 0x0 0xfc>;
97+
reg = <0x0 0x1fb00000 0x0 0x970>;
10598
#clock-cells = <1>;
10699
#reset-cells = <1>;
107100
};
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/amlogic,meson8-clkc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Meson8, Meson8b and Meson8m2 Clock and Reset Controller
8+
9+
maintainers:
10+
- Neil Armstrong <[email protected]>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- enum:
16+
- amlogic,meson8-clkc
17+
- amlogic,meson8b-clkc
18+
- items:
19+
- const: amlogic,meson8m2-clkc
20+
- const: amlogic,meson8-clkc
21+
22+
clocks:
23+
minItems: 2
24+
maxItems: 3
25+
26+
clock-names:
27+
minItems: 2
28+
items:
29+
- const: xtal
30+
- const: ddr_pll
31+
- const: clk_32k
32+
33+
'#clock-cells':
34+
const: 1
35+
36+
'#reset-cells':
37+
const: 1
38+
39+
required:
40+
- compatible
41+
- clocks
42+
- clock-names
43+
- '#reset-cells'
44+
45+
additionalProperties: false

Documentation/devicetree/bindings/clock/amlogic,meson8b-clkc.txt

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/gated-fixed-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Gated Fixed clock
8+
9+
maintainers:
10+
- Heiko Stuebner <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: gated-fixed-clock
15+
16+
"#clock-cells":
17+
const: 0
18+
19+
clock-frequency: true
20+
21+
clock-output-names:
22+
maxItems: 1
23+
24+
enable-gpios:
25+
description:
26+
Contains a single GPIO specifier for the GPIO that enables and disables
27+
the oscillator.
28+
maxItems: 1
29+
30+
vdd-supply:
31+
description: handle of the regulator that provides the supply voltage
32+
33+
required:
34+
- compatible
35+
- "#clock-cells"
36+
- clock-frequency
37+
- vdd-supply
38+
39+
additionalProperties: false
40+
41+
examples:
42+
- |
43+
clock-1000000000 {
44+
compatible = "gated-fixed-clock";
45+
#clock-cells = <0>;
46+
clock-frequency = <1000000000>;
47+
vdd-supply = <&reg_vdd>;
48+
};
49+
...

Documentation/devicetree/bindings/clock/imx93-clock.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ description: |
1616
properties:
1717
compatible:
1818
enum:
19+
- fsl,imx91-ccm
1920
- fsl,imx93-ccm
2021

2122
reg:

0 commit comments

Comments
 (0)