Skip to content

Commit 49f4c2d

Browse files
committed
Merge branches 'clk-ofnode', 'clk-bindings', 'clk-cleanup', 'clk-zynq' and 'clk-xilinx' into clk-next
- Miscellaneous of_node_put() fixes - Nuke dt-bindings/clk path (again) by moving headers to dt-bindings/clock - Convert gpio-clk-gate binding to YAML - Various fixes to AMD/Xilinx Zynqmp clk driver - Graduate AMD/Xilinx "clocking wizard" driver from staging * clk-ofnode: clk: ti: Balance of_node_get() calls for of_find_node_by_name() clk: tegra20: Fix refcount leak in tegra20_clock_init clk: tegra: Fix refcount leak in tegra114_clock_init clk: tegra: Fix refcount leak in tegra210_clock_init clk: sprd: Hold reference returned by of_get_parent() clk: berlin: Add of_node_put() for of_get_parent() clk: at91: dt-compat: Hold reference returned by of_get_parent() clk: qoriq: Hold reference returned by of_get_parent() clk: oxnas: Hold reference returned by of_get_parent() clk: st: Hold reference returned by of_get_parent() clk: tegra: Add missing of_node_put() clk: meson: Hold reference returned by of_get_parent() clk: nomadik: Add missing of_node_put() * clk-bindings: dt-bindings: clock: drop minItems equal to maxItems dt-bindings: clock: gpio-gate-clock: Convert to json-schema dt-bindings: clock: Move versaclock.h to dt-bindings/clock dt-bindings: clock: Move lochnagar.h to dt-bindings/clock * clk-cleanup: clk: allow building lan966x as a module clk: clk-xgene: simplify if-if to if-else clk: nxp: fix typo in comment clk: mvebu: armada-37xx-tbg: Remove the unneeded result variable clk: ti: dra7-atl: Fix reference leak in of_dra7_atl_clk_probe clkdev: Simplify devm_clk_hw_register_clkdev() function clkdev: Remove never used devm_clk_release_clkdev() clk: Remove never used devm_of_clk_del_provider() clk: pistachio: Fix initconst confusion clk: clk-npcm7xx: Remove unused struct npcm7xx_clk_gate_data and npcm7xx_clk_div_fixed_data clk: do not initialize ret clk: remove extra empty line clk: Fix comment typo clk: move from strlcpy with unused retval to strscpy * clk-zynq: clk: zynqmp: pll: rectify rate rounding in zynqmp_pll_round_rate clk: zynqmp: Check the return type zynqmp_pm_query_data clk: zynqmp: Add a check for NULL pointer clk: zynqmp: Replaced strncpy() with strscpy() clk: zynqmp: Fix stack-out-of-bounds in strncpy` clk: zynqmp: make bestdiv unsigned * clk-xilinx: clk: clocking-wizard: Depend on HAS_IOMEM clk: clocking-wizard: Use dev_err_probe() helper clk: clocking-wizard: Update the compatible clk: clocking-wizard: Fix the reconfig for 5.2 clk: clocking-wizard: Rename nr-outputs to xlnx,nr-outputs clk: clocking-wizard: Move clocking-wizard out dt-bindings: add documentation of xilinx clocking wizard
6 parents 1c23f9e + 058a399 + 4bafca8 + 8a977bb + 30eaf02 + c00b5f2 commit 49f4c2d

Some content is hidden

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

61 files changed

+372
-300
lines changed

Documentation/devicetree/bindings/clock/cirrus,cs2000-cp.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ properties:
2323
clocks:
2424
description:
2525
Common clock binding for CLK_IN, XTI/REF_CLK
26-
minItems: 2
2726
maxItems: 2
2827

2928
clock-names:

Documentation/devicetree/bindings/clock/gpio-gate-clock.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/gpio-gate-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Simple GPIO clock gate
8+
9+
maintainers:
10+
- Jyri Sarha <jsarha@ti.com>
11+
12+
properties:
13+
compatible:
14+
const: gpio-gate-clock
15+
16+
clocks:
17+
maxItems: 1
18+
19+
'#clock-cells':
20+
const: 0
21+
22+
enable-gpios:
23+
description: GPIO reference for enabling and disabling the clock.
24+
maxItems: 1
25+
26+
required:
27+
- compatible
28+
- '#clock-cells'
29+
- enable-gpios
30+
31+
additionalProperties: false
32+
33+
examples:
34+
- |
35+
#include <dt-bindings/gpio/gpio.h>
36+
37+
clock {
38+
compatible = "gpio-gate-clock";
39+
clocks = <&parentclk>;
40+
#clock-cells = <0>;
41+
enable-gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
42+
};

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ patternProperties:
108108
properties:
109109
idt,mode:
110110
description:
111-
The output drive mode. Values defined in dt-bindings/clk/versaclock.h
111+
The output drive mode. Values defined in dt-bindings/clock/versaclock.h
112112
$ref: /schemas/types.yaml#/definitions/uint32
113113
minimum: 0
114114
maximum: 6
@@ -151,7 +151,7 @@ additionalProperties: false
151151

152152
examples:
153153
- |
154-
#include <dt-bindings/clk/versaclock.h>
154+
#include <dt-bindings/clock/versaclock.h>
155155
156156
/* 25MHz reference crystal */
157157
ref25: ref25m {

Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ properties:
4747
maxItems: 1
4848

4949
clocks:
50-
minItems: 4
5150
maxItems: 4
5251

5352
clock-names:
@@ -64,7 +63,6 @@ properties:
6463
maxItems: 1
6564

6665
resets:
67-
minItems: 2
6866
maxItems: 2
6967

7068
reset-names:

Documentation/devicetree/bindings/clock/samsung,s2mps11.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@ properties:
3434
const: 1
3535

3636
clock-output-names:
37-
minItems: 3
3837
maxItems: 3
3938
description: Names for AP, CP and BT clocks.
4039

Documentation/devicetree/bindings/clock/ti/gate.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ will be controlled instead and the corresponding hw-ops for
1010
that is used.
1111

1212
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
13-
[2] Documentation/devicetree/bindings/clock/gpio-gate-clock.txt
13+
[2] Documentation/devicetree/bindings/clock/gpio-gate-clock.yaml
1414
[3] Documentation/devicetree/bindings/clock/ti/clockdomain.txt
1515

1616
Required properties:

Documentation/devicetree/bindings/clock/ti/interface.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ companion clock finding (match corresponding functional gate
99
clock) and hardware autoidle enable / disable.
1010

1111
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
12-
[2] Documentation/devicetree/bindings/clock/gpio-gate-clock.txt
12+
[2] Documentation/devicetree/bindings/clock/gpio-gate-clock.yaml
1313

1414
Required properties:
1515
- compatible : shall be one of:
Lines changed: 77 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,77 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/clock/xlnx,clocking-wizard.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Xilinx clocking wizard
8+
9+
maintainers:
10+
- Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
11+
12+
description:
13+
The clocking wizard is a soft ip clocking block of Xilinx versal. It
14+
reads required input clock frequencies from the devicetree and acts as clock
15+
clock output.
16+
17+
properties:
18+
compatible:
19+
enum:
20+
- xlnx,clocking-wizard
21+
- xlnx,clocking-wizard-v5.2
22+
- xlnx,clocking-wizard-v6.0
23+
24+
25+
reg:
26+
maxItems: 1
27+
28+
"#clock-cells":
29+
const: 1
30+
31+
clocks:
32+
items:
33+
- description: clock input
34+
- description: axi clock
35+
36+
clock-names:
37+
items:
38+
- const: clk_in1
39+
- const: s_axi_aclk
40+
41+
42+
xlnx,speed-grade:
43+
$ref: /schemas/types.yaml#/definitions/uint32
44+
enum: [1, 2, 3]
45+
description:
46+
Speed grade of the device. Higher the speed grade faster is the FPGA device.
47+
48+
xlnx,nr-outputs:
49+
$ref: /schemas/types.yaml#/definitions/uint32
50+
minimum: 1
51+
maximum: 8
52+
description:
53+
Number of outputs.
54+
55+
required:
56+
- compatible
57+
- reg
58+
- "#clock-cells"
59+
- clocks
60+
- clock-names
61+
- xlnx,speed-grade
62+
- xlnx,nr-outputs
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
clock-controller@b0000000 {
69+
compatible = "xlnx,clocking-wizard";
70+
reg = <0xb0000000 0x10000>;
71+
#clock-cells = <1>;
72+
xlnx,speed-grade = <1>;
73+
xlnx,nr-outputs = <6>;
74+
clock-names = "clk_in1", "s_axi_aclk";
75+
clocks = <&clkc 15>, <&clkc 15>;
76+
};
77+
...

Documentation/devicetree/bindings/mfd/cirrus,lochnagar.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ additionalProperties: false
261261

262262
examples:
263263
- |
264-
#include <dt-bindings/clk/lochnagar.h>
264+
#include <dt-bindings/clock/lochnagar.h>
265265
#include <dt-bindings/pinctrl/lochnagar.h>
266266
i2c@e0004000 {
267267
#address-cells = <1>;

0 commit comments

Comments
 (0)