Skip to content

Commit 9f32a03

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 has been a semi-quiet cycle. The core framework remains unchanged this time around. In terms of shiny new code though, we have support for the SpacemiT K1 SoC, Sophgo SG2044, and T-HEAD TH1520 VO clk drivers joining the usual silicon players like Qualcomm, Samsung, Allwinner, and Renesas. Surprisingly, the Qualcomm pile was smaller than usual but that is likely because they put one SoC support inside a driver for a different SoC that is very similar. Other than all those new clk drivers there are the usual clk data updates to fix parents, frequency tables, and add missing clks along with some Kconfig changes to make compile testing simpler and even more DT binding conversions to boot. The exciting part is still the new SoC support like SpacemiT and Sophgo support though, which really dominate the diffstat because they introduce a whole new silicon vendor clk driver. New Drivers: - Camera clock controller driver for Qualcomm QCS8300 - DE (display engine) 3.3 clocks on Allwinner H616 - Samsung ExynosAutov920 CPU cluster CL0, CL1 and CL2 clock controllers - Video Output (VO) subsystem clk controller in the T-HEAD TH1520 SoC - Clock driver for Sophgo SG2044 - Clock driver for SpacemiT K1 SoC - Renesas RZ/V2N (R9A09G056) SoC clk driver Updates: - Correct data in various SoC clk drivers - Allow clkaN to be optional in the Qualcomm RPMh clock controller driver if command db doesn't define it - Change Kconfig options to not enable by default during compile testing - Add missing clks in various SoC clk drivers - Remove some duplicate clk DT bindings and convert some more to YAML" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (93 commits) clk: qcom: gcc-x1e80100: Set FORCE MEM CORE for UFS clocks clk: qcom: gcc: Set FORCE_MEM_CORE_ON for gcc_ufs_axi_clk for 8650/8750 clk: qcom: rpmh: make clkaN optional clk: qcom: Add support for Camera Clock Controller on QCS8300 clk: rockchip: rk3528: add slab.h header include clk: rockchip: rk3576: add missing slab.h include clk: meson: Do not enable by default during compile testing clk: meson-g12a: add missing fclk_div2 to spicc clk: qcom: gcc-msm8939: Fix mclk0 & mclk1 for 24 MHz clk: rockchip: rename gate-grf clk file clk: rockchip: rename branch_muxgrf to branch_grf_mux clk: sunxi-ng: ccu: add Display Engine 3.3 (DE33) support dt-bindings: allwinner: add H616 DE33 clock binding clk: samsung: correct clock summary for hsi1 block dt-bindings: clock: add SM6350 QCOM video clock bindings clk: rockchip: Pass NULL as reg pointer when registering GRF MMC clocks clk: sunxi-ng: h616: Add LVDS reset for LCD TCON dt-bindings: clock: sun50i-h616-ccu: Add LVDS reset clk: rockchip: rk3036: mark ddrphy as critical clk: rockchip: rk3036: fix implementation of usb480m clock mux ...
2 parents d844152 + 63bfd78 commit 9f32a03

File tree

100 files changed

+7298
-526
lines changed

Some content is hidden

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

100 files changed

+7298
-526
lines changed

Documentation/devicetree/bindings/clock/allwinner,sun8i-a83t-de2-clk.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ properties:
2525
- const: allwinner,sun50i-a64-de2-clk
2626
- const: allwinner,sun50i-h5-de2-clk
2727
- const: allwinner,sun50i-h6-de3-clk
28+
- const: allwinner,sun50i-h616-de33-clk
2829
- items:
2930
- const: allwinner,sun8i-r40-de2-clk
3031
- const: allwinner,sun8i-h3-de2-clk

Documentation/devicetree/bindings/clock/brcm,bcm2835-aux-clock.txt

Lines changed: 0 additions & 31 deletions
This file was deleted.
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/brcm,bcm2835-aux-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM2835 auxiliary peripheral clock
8+
9+
maintainers:
10+
- Stefan Wahren <wahrenst@gmx.net>
11+
- Raspberry Pi Kernel Maintenance <kernel-list@raspberrypi.com>
12+
13+
description:
14+
The auxiliary peripherals (UART, SPI1, and SPI2) have a small register
15+
area controlling clock gating to the peripherals, and providing an IRQ
16+
status register.
17+
18+
properties:
19+
compatible:
20+
const: brcm,bcm2835-aux
21+
22+
reg:
23+
maxItems: 1
24+
25+
"#clock-cells":
26+
const: 1
27+
28+
clocks:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- reg
34+
- "#clock-cells"
35+
- clocks
36+
37+
additionalProperties: false
38+
39+
examples:
40+
- |
41+
#include <dt-bindings/clock/bcm2835.h>
42+
clock@7e215000 {
43+
compatible = "brcm,bcm2835-aux";
44+
reg = <0x7e215000 0x8>;
45+
#clock-cells = <1>;
46+
clocks = <&clocks BCM2835_CLOCK_VPU>;
47+
};
Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
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,vf610-ccm.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Clock for Freescale Vybrid VF610 SOC
8+
9+
description:
10+
The clock consumer should specify the desired clock by having the clock
11+
ID in its "clocks" phandle cell. See include/dt-bindings/clock/vf610-clock.h
12+
for the full list of VF610 clock IDs
13+
14+
maintainers:
15+
- Frank Li <Frank.Li@nxp.com>
16+
17+
properties:
18+
compatible:
19+
const: fsl,vf610-ccm
20+
21+
reg:
22+
maxItems: 1
23+
24+
'#clock-cells':
25+
const: 1
26+
27+
clocks:
28+
items:
29+
- description: external crystal oscillator 32KHz, recommended
30+
- description: external crystal oscillator 24MHz, recommended
31+
- description: audio
32+
- description: enet
33+
minItems: 2
34+
35+
clock-names:
36+
items:
37+
- const: sxosc
38+
- const: fxosc
39+
- const: enet_ext
40+
- const: audio_ext
41+
minItems: 2
42+
43+
required:
44+
- compatible
45+
- reg
46+
47+
additionalProperties: false
48+
49+
examples:
50+
- |
51+
clock-controller@4006b000 {
52+
compatible = "fsl,vf610-ccm";
53+
reg = <0x4006b000 0x1000>;
54+
#clock-cells = <1>;
55+
clocks = <&sxosc>, <&fxosc>;
56+
clock-names = "sxosc", "fxosc";
57+
};
58+

Documentation/devicetree/bindings/clock/maxim,max77686.txt

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

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

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ description: |
1414
domains on Qualcomm SoCs.
1515
1616
See also::
17+
include/dt-bindings/clock/qcom,sm6350-videocc.h
1718
include/dt-bindings/clock/qcom,videocc-sc7180.h
1819
include/dt-bindings/clock/qcom,videocc-sc7280.h
1920
include/dt-bindings/clock/qcom,videocc-sdm845.h
@@ -26,6 +27,7 @@ properties:
2627
- qcom,sc7180-videocc
2728
- qcom,sc7280-videocc
2829
- qcom,sdm845-videocc
30+
- qcom,sm6350-videocc
2931
- qcom,sm8150-videocc
3032
- qcom,sm8250-videocc
3133

@@ -87,6 +89,24 @@ allOf:
8789
- const: bi_tcxo
8890
- const: bi_tcxo_ao
8991

92+
- if:
93+
properties:
94+
compatible:
95+
enum:
96+
- qcom,sm6350-videocc
97+
then:
98+
properties:
99+
clocks:
100+
items:
101+
- description: Video AHB clock from GCC
102+
- description: Board XO source
103+
- description: Sleep Clock source
104+
clock-names:
105+
items:
106+
- const: iface
107+
- const: bi_tcxo
108+
- const: sleep_clk
109+
90110
- if:
91111
properties:
92112
compatible:

Documentation/devicetree/bindings/clock/renesas,rzv2h-cpg.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@
44
$id: http://devicetree.org/schemas/clock/renesas,rzv2h-cpg.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Renesas RZ/{G3E,V2H(P)} Clock Pulse Generator (CPG)
7+
title: Renesas RZ/{G3E,V2H(P),V2N} Clock Pulse Generator (CPG)
88

99
maintainers:
1010
- Lad Prabhakar <prabhakar.mahadev-lad.rj@bp.renesas.com>
1111

1212
description:
13-
On Renesas RZ/{G3E,V2H(P)} SoCs, the CPG (Clock Pulse Generator) handles
13+
On Renesas RZ/{G3E,V2H(P),V2N} SoCs, the CPG (Clock Pulse Generator) handles
1414
generation and control of clock signals for the IP modules, generation and
1515
control of resets, and control over booting, low power consumption and power
1616
supply domains.
@@ -19,6 +19,7 @@ properties:
1919
compatible:
2020
enum:
2121
- renesas,r9a09g047-cpg # RZ/G3E
22+
- renesas,r9a09g056-cpg # RZ/V2N
2223
- renesas,r9a09g057-cpg # RZ/V2H
2324

2425
reg:

0 commit comments

Comments
 (0)