Skip to content

Commit c63e2a7

Browse files
committed
Merge branches 'clk-socfpga', 'clk-doc', 'clk-qcom', 'clk-vc5' and 'clk-bcm' into clk-next
- Enable CPU clks on Qualcomm IPQ6018 SoCs - Enable CPU clks on Qualcomm MSM8996 SoCs - GPU clk support for Qualcomm SM8150 and SM8250 SoCs - Audio clks on Qualcomm SC7180 SoCs - Make defines for bcm63xx-gate clks to use in DT - Support gate clks on BCM6318 SoCs - Add HDMI clks for BCM2711 SoCs - Support BCM2711 SoC firmware clks * clk-socfpga: clk: socfpga: agilex: mpu_l2ram_clk should be mpu_ccu_clk clk: socfpga: agilex: add nand_x_clk and nand_ecc_clk dt-bindings: agilex: add NAND_X_CLK and NAND_ECC_CLK * clk-doc: clk: Clean up kernel-doc errors clk: <linux/clk-provider.h>: drop a duplicated word clk: add function documentation for clk_hw_round_rate() * clk-qcom: (38 commits) dt-bindings: clock: Fix YAML schemas for LPASS clocks on SC7180 clk: qcom: gcc-sdm660: Fix up gcc_mss_mnoc_bimc_axi_clk clk: qcom: gcc-sdm660: Add missing modem reset clk: qcom: lpass: Add support for LPASS clock controller for SC7180 clk: qcom: gcc: Add support for GCC LPASS clock for SC7180 dt-bindings: clock: Add YAML schemas for LPASS clocks on SC7180 clk: qcom: gdsc: Add support to enable retention of GSDCR clk: qcom: Export gdsc_gx_do_nothing_enable() to modules clk: qcom: Add graphics clock controller driver for SM8250 clk: qcom: Add graphics clock controller driver for SM8150 clk: qcom: add common gdsc_gx_do_nothing_enable for gpucc drivers dt-bindings: clock: add SM8250 QCOM Graphics clock bindings dt-bindings: clock: add SM8150 QCOM Graphics clock bindings dt-bindings: clock: combine qcom,sdm845-gpucc and qcom,sc7180-gpucc clk: qcom: gcc: remove unnecessary vco_table from SM8150 clk: qcom: clk-alpha-pll: use the right PCAL_DONE value for lucid pll clk: qcom: clk-alpha-pll: same regs and ops for trion and lucid clk: qcom: clk-alpha-pll: remove unused/incorrect PLL_CAL_VAL clk: qcom: gcc: fix sm8150 GPU and NPU clocks dt-bindings: clock: Fix qcom,msm8996-apcc yaml syntax ... * clk-vc5: clk: vc5: use a dedicated struct to describe the output drivers dt-bindings: clk: versaclock5: convert to yaml MAINTAINERS: take over IDT VersaClock 5 clock driver dt-bindings: clk: versaclock5: fix 'idt' prefix typos clk: vc5: Add memory check to prevent oops clk: vc5: fix use of memory after it has been kfree'd clk: vc5: Enable addition output configurations of the Versaclock dt: Add additional option bindings for IDT VersaClock clk: vc5: Allow Versaclock driver to support multiple instances * clk-bcm: (44 commits) clk: bcm2835: Do not use prediv with bcm2711's PLLs dt-bindings: arm: bcm: Add a select to the RPI Firmware binding clk: bcm: dvp: Add missing module informations clk: bcm: rpi: Remove the quirks for the CPU clock clk: bcm2835: Don't cache the PLLB rate clk: bcm2835: Allow custom CCF flags for the PLLs Revert "clk: bcm2835: remove pllb" clk: bcm: rpi: Give firmware clocks a name clk: bcm: rpi: Discover the firmware clocks clk: bcm: rpi: Add an enum for the firmware clocks clk: bcm: rpi: Add DT provider for the clocks clk: bcm: rpi: Make the PLLB registration function return a clk_hw clk: bcm: rpi: Split pllb clock hooks clk: bcm: rpi: Rename is_prepared function clk: bcm: rpi: Pass the clocks data to the firmware function clk: bcm: rpi: Add clock id to data clk: bcm: rpi: Create a data structure for the clocks clk: bcm: rpi: Use CCF boundaries instead of rolling our own clk: bcm: rpi: Make sure the clkdev lookup is removed clk: bcm: rpi: Switch to clk_hw_register_clkdev ...
5 parents 44a7f3e + 6378cfd + 9f4db31 + 3bca66b + f34e465 commit c63e2a7

Some content is hidden

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

71 files changed

+4428
-695
lines changed

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Raspberry Pi VideoCore firmware driver
8+
9+
maintainers:
10+
- Eric Anholt <[email protected]>
11+
- Stefan Wahren <[email protected]>
12+
13+
select:
14+
properties:
15+
compatible:
16+
contains:
17+
const: raspberrypi,bcm2835-firmware
18+
19+
required:
20+
- compatible
21+
22+
properties:
23+
compatible:
24+
items:
25+
- const: raspberrypi,bcm2835-firmware
26+
- const: simple-bus
27+
28+
mboxes:
29+
$ref: '/schemas/types.yaml#/definitions/phandle'
30+
description: |
31+
Phandle to the firmware device's Mailbox.
32+
(See: ../mailbox/mailbox.txt for more information)
33+
34+
clocks:
35+
type: object
36+
37+
properties:
38+
compatible:
39+
const: raspberrypi,firmware-clocks
40+
41+
"#clock-cells":
42+
const: 1
43+
description: >
44+
The argument is the ID of the clocks contained by the
45+
firmware messages.
46+
47+
required:
48+
- compatible
49+
- "#clock-cells"
50+
51+
additionalProperties: false
52+
53+
required:
54+
- compatible
55+
- mboxes
56+
57+
examples:
58+
- |
59+
firmware {
60+
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
61+
mboxes = <&mailbox>;
62+
63+
firmware_clocks: clocks {
64+
compatible = "raspberrypi,firmware-clocks";
65+
#clock-cells = <1>;
66+
};
67+
};
68+
...
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,bcm2711-dvp.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM2711 HDMI DVP Device Tree Bindings
8+
9+
maintainers:
10+
- Maxime Ripard <[email protected]>
11+
12+
properties:
13+
"#clock-cells":
14+
const: 1
15+
16+
"#reset-cells":
17+
const: 1
18+
19+
compatible:
20+
const: brcm,brcm2711-dvp
21+
22+
reg:
23+
maxItems: 1
24+
25+
clocks:
26+
maxItems: 1
27+
28+
required:
29+
- "#clock-cells"
30+
- "#reset-cells"
31+
- compatible
32+
- reg
33+
- clocks
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
dvp: clock@7ef00000 {
40+
compatible = "brcm,brcm2711-dvp";
41+
reg = <0x7ef00000 0x10>;
42+
clocks = <&clk_108MHz>;
43+
#clock-cells = <1>;
44+
#reset-cells = <1>;
45+
};
46+
47+
...

Documentation/devicetree/bindings/clock/brcm,bcm63xx-clocks.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Gated Clock Controller Bindings for MIPS based BCM63XX SoCs
33
Required properties:
44
- compatible: must be one of:
55
"brcm,bcm3368-clocks"
6+
"brcm,bcm6318-clocks"
7+
"brcm,bcm6318-ubus-clocks"
68
"brcm,bcm6328-clocks"
79
"brcm,bcm6358-clocks"
810
"brcm,bcm6362-clocks"

Documentation/devicetree/bindings/clock/idt,versaclock5.txt

Lines changed: 0 additions & 92 deletions
This file was deleted.
Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/idt,versaclock5.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Binding for IDT VersaClock 5 and 6 programmable I2C clock generators
8+
9+
description: |
10+
The IDT VersaClock 5 and VersaClock 6 are programmable I2C
11+
clock generators providing from 3 to 12 output clocks.
12+
13+
When referencing the provided clock in the DT using phandle and clock
14+
specifier, the following mapping applies:
15+
16+
- 5P49V5923:
17+
0 -- OUT0_SEL_I2CB
18+
1 -- OUT1
19+
2 -- OUT2
20+
21+
- 5P49V5933:
22+
0 -- OUT0_SEL_I2CB
23+
1 -- OUT1
24+
2 -- OUT4
25+
26+
- other parts:
27+
0 -- OUT0_SEL_I2CB
28+
1 -- OUT1
29+
2 -- OUT2
30+
3 -- OUT3
31+
4 -- OUT4
32+
33+
maintainers:
34+
- Luca Ceresoli <[email protected]>
35+
36+
properties:
37+
compatible:
38+
enum:
39+
- idt,5p49v5923
40+
- idt,5p49v5925
41+
- idt,5p49v5933
42+
- idt,5p49v5935
43+
- idt,5p49v6901
44+
- idt,5p49v6965
45+
46+
reg:
47+
description: I2C device address
48+
enum: [ 0x68, 0x6a ]
49+
50+
'#clock-cells':
51+
const: 1
52+
53+
patternProperties:
54+
"^OUT[1-4]$":
55+
type: object
56+
description:
57+
Description of one of the outputs (OUT1..OUT4). See "Clock1 Output
58+
Configuration" in the Versaclock 5/6/6E Family Register Description
59+
and Programming Guide.
60+
properties:
61+
idt,mode:
62+
description:
63+
The output drive mode. Values defined in dt-bindings/clk/versaclock.h
64+
$ref: /schemas/types.yaml#/definitions/uint32
65+
minimum: 0
66+
maximum: 6
67+
idt,voltage-microvolt:
68+
description: The output drive voltage.
69+
enum: [ 1800000, 2500000, 3300000 ]
70+
idt,slew-percent:
71+
description: The Slew rate control for CMOS single-ended.
72+
$ref: /schemas/types.yaml#/definitions/uint32
73+
enum: [ 80, 85, 90, 100 ]
74+
75+
required:
76+
- compatible
77+
- reg
78+
- '#clock-cells'
79+
80+
allOf:
81+
- if:
82+
properties:
83+
compatible:
84+
enum:
85+
- idt,5p49v5933
86+
- idt,5p49v5935
87+
then:
88+
# Devices with builtin crystal + optional external input
89+
properties:
90+
clock-names:
91+
const: clkin
92+
clocks:
93+
maxItems: 1
94+
else:
95+
# Devices without builtin crystal
96+
properties:
97+
clock-names:
98+
minItems: 1
99+
maxItems: 2
100+
items:
101+
enum: [ xin, clkin ]
102+
clocks:
103+
minItems: 1
104+
maxItems: 2
105+
required:
106+
- clock-names
107+
- clocks
108+
109+
examples:
110+
- |
111+
#include <dt-bindings/clk/versaclock.h>
112+
113+
/* 25MHz reference crystal */
114+
ref25: ref25m {
115+
compatible = "fixed-clock";
116+
#clock-cells = <0>;
117+
clock-frequency = <25000000>;
118+
};
119+
120+
i2c@0 {
121+
reg = <0x0 0x100>;
122+
#address-cells = <1>;
123+
#size-cells = <0>;
124+
125+
/* IDT 5P49V5923 I2C clock generator */
126+
vc5: clock-generator@6a {
127+
compatible = "idt,5p49v5923";
128+
reg = <0x6a>;
129+
#clock-cells = <1>;
130+
131+
/* Connect XIN input to 25MHz reference */
132+
clocks = <&ref25m>;
133+
clock-names = "xin";
134+
135+
OUT1 {
136+
idt,drive-mode = <VC5_CMOSD>;
137+
idt,voltage-microvolts = <1800000>;
138+
idt,slew-percent = <80>;
139+
};
140+
141+
OUT4 {
142+
idt,drive-mode = <VC5_LVDS>;
143+
};
144+
};
145+
};
146+
147+
/* Consumer referencing the 5P49V5923 pin OUT1 */
148+
consumer {
149+
/* ... */
150+
clocks = <&vc5 1>;
151+
/* ... */
152+
};
153+
154+
...

0 commit comments

Comments
 (0)