Skip to content

Commit 05a5b5d

Browse files
committed
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull more clk updates from Stephen Boyd: "Here's some more updates that missed the last pull request because I happened to tag the tree at an earlier point in the history of clk-next. I must have fat fingered it and checked out an older version of clk-next on this second computer I'm using. This time it actually includes more code for Qualcomm SoCs, the AT91 major updates, and some Rockchip SoC clk driver updates as well. I've corrected this flow so this shouldn't happen again" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (83 commits) clk: bcm2835: Do not use prediv with bcm2711's PLLs clk: drop unused function __clk_get_flags clk: hsdk: Fix bad dependency on IOMEM dt-bindings: clock: Fix YAML schemas for LPASS clocks on SC7180 clk: mmp: avoid missing prototype warning clk: sparx5: Add Sparx5 SoC DPLL clock driver dt-bindings: clock: sparx5: Add bindings include file clk: qoriq: add LS1021A core pll mux options clk: clk-atlas6: fix return value check in atlas6_clk_init() clk: tegra: pll: Improve PLLM enable-state detection clk: X1000: Add support for calculat REFCLK of USB PHY. clk: JZ4780: Reformat the code to align it. clk: JZ4780: Add functions for enable and disable USB PHY. clk: Ingenic: Add RTC related clocks for Ingenic SoCs. dt-bindings: clock: Add tabs to align code. dt-bindings: clock: Add RTC related clocks for Ingenic SoCs. clk: davinci: Use fallthrough pseudo-keyword clk: imx: Use fallthrough pseudo-keyword clk: qcom: gcc-sdm660: Fix up gcc_mss_mnoc_bimc_axi_clk clk: qcom: gcc-sdm660: Add missing modem reset ...
2 parents 4586039 + dd9c697 commit 05a5b5d

Some content is hidden

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

82 files changed

+4778
-871
lines changed

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,15 @@ maintainers:
1010
- Eric Anholt <[email protected]>
1111
- Stefan Wahren <[email protected]>
1212

13+
select:
14+
properties:
15+
compatible:
16+
contains:
17+
const: raspberrypi,bcm2835-firmware
18+
19+
required:
20+
- compatible
21+
1322
properties:
1423
compatible:
1524
items:

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

Lines changed: 0 additions & 125 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+
...

Documentation/devicetree/bindings/clock/qcom,sdm845-gpucc.yaml renamed to Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,31 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/clock/qcom,sdm845-gpucc.yaml#
4+
$id: http://devicetree.org/schemas/clock/qcom,gpucc.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

7-
title: Qualcomm Graphics Clock & Reset Controller Binding for SDM845
7+
title: Qualcomm Graphics Clock & Reset Controller Binding
88

99
maintainers:
1010
- Taniya Das <[email protected]>
1111

1212
description: |
1313
Qualcomm graphics clock control module which supports the clocks, resets and
14-
power domains on SDM845.
14+
power domains on SDM845/SC7180/SM8150/SM8250.
1515
16-
See also dt-bindings/clock/qcom,gpucc-sdm845.h.
16+
See also:
17+
dt-bindings/clock/qcom,gpucc-sdm845.h
18+
dt-bindings/clock/qcom,gpucc-sc7180.h
19+
dt-bindings/clock/qcom,gpucc-sm8150.h
20+
dt-bindings/clock/qcom,gpucc-sm8250.h
1721
1822
properties:
1923
compatible:
20-
const: qcom,sdm845-gpucc
24+
enum:
25+
- qcom,sdm845-gpucc
26+
- qcom,sc7180-gpucc
27+
- qcom,sm8150-gpucc
28+
- qcom,sm8250-gpucc
2129

2230
clocks:
2331
items:

Documentation/devicetree/bindings/clock/qcom,msm8996-apcc.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/clock/qcom,kryocc.yaml#
4+
$id: http://devicetree.org/schemas/clock/qcom,msm8996-apcc.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Qualcomm clock controller for MSM8996 CPUs
@@ -46,11 +46,9 @@ required:
4646
additionalProperties: false
4747

4848
examples:
49-
# Example for msm8996
5049
- |
5150
kryocc: clock-controller@6400000 {
5251
compatible = "qcom,msm8996-apcc";
5352
reg = <0x6400000 0x90000>;
5453
#clock-cells = <1>;
55-
};
56-
...
54+
};

0 commit comments

Comments
 (0)