Skip to content

Commit f7887ee

Browse files
committed
Merge branches 'clk-bindings', 'clk-cleanup', 'clk-pwm', 'clk-hw-device', 'clk-xilinx' and 'clk-adi' into clk-next
- Support atomic PWMs in the PWM clk driver - clk_hw_get_dev() and clk_hw_get_of_node() helpers * clk-bindings: (30 commits) dt-bindings: clock: convert lpc1850-cgu.txt to yaml format dt-bindings: clock: Convert qca,ath79-pll to DT schema dt-bindings: clock: Convert nuvoton,npcm750-clk to DT schema dt-bindings: clock: Convert moxa,moxart-clock to DT schema dt-bindings: clock: Convert microchip,pic32mzda-clk to DT schema dt-bindings: clock: Convert maxim,max9485 to DT schema dt-bindings: clock: Convert qcom,krait-cc to DT schema dt-bindings: clock: qcom: Remove double colon from description dt-bindings: clock: convert lpc1850-ccu.txt to yaml format dt-bindings: clock: Convert alphascale,asm9260-clock-controller to DT schema dt-bindings: clock: Convert marvell,armada-370-corediv-clock to DT schema dt-bindings: clock: Convert marvell,armada-3700-periph-clock to DT schema dt-bindings: clock: Convert marvell,mvebu-core-clock to DT schema dt-bindings: clock: Convert marvell,berlin2-clk to DT schema dt-bindings: clock: Convert marvell,dove-divider-clock to DT schema dt-bindings: clock: Convert marvell,armada-3700-tbg-clock to DT schema dt-bindings: clock: Convert marvell-armada-370-gating-clock to DT schema dt-bindings: clock: Convert marvell,armada-xp-cpu-clock to DT schema dt-bindings: clock: Convert TI-NSPIRE clocks to DT schema dt-bindings: clock: Convert lsi,axm5516-clks to DT schema ... * clk-cleanup: (29 commits) clk: clocking-wizard: Fix the round rate handling for versal clk: Fix typos clk: tegra: periph: Make tegra_clk_periph_ops static clk: tegra: periph: Fix error handling and resolve unsigned compare warning clk: imx: scu: convert from round_rate() to determine_rate() clk: imx: pllv4: convert from round_rate() to determine_rate() clk: imx: pllv3: convert from round_rate() to determine_rate() clk: imx: pllv2: convert from round_rate() to determine_rate() clk: imx: pll14xx: convert from round_rate() to determine_rate() clk: imx: pfd: convert from round_rate() to determine_rate() clk: imx: frac-pll: convert from round_rate() to determine_rate() clk: imx: fracn-gppll: convert from round_rate() to determine_rate() clk: imx: fixup-div: convert from round_rate() to determine_rate() clk: imx: cpu: convert from round_rate() to determine_rate() clk: imx: busy: convert from round_rate() to determine_rate() clk: imx: composite-93: remove round_rate() in favor of determine_rate() clk: imx: composite-8m: remove round_rate() in favor of determine_rate() clk: bcm: bcm2835: convert from round_rate() to determine_rate() MAINTAINERS: Include clk.py under COMMON CLK FRAMEWORK entry clk: ti: Simplify ti_find_clock_provider() ... * clk-pwm: clk: pwm: Make use of non-sleeping PWMs clk: pwm: Don't reconfigure running PWM at probe time clk: pwm: Convert to use pwm_apply_might_sleep() clk: pwm: Let .get_duty_cycle() return the real duty cycle * clk-hw-device: clk: tests: add clk_hw_get_dev() and clk_hw_get_of_node() tests clk: tests: Make clk_register_clk_parent_data_device_driver() common clk: add a clk_hw helpers to get the clock device or device_node * clk-xilinx: clk: xilinx: vcu: Update vcu init/reset sequence clk: xilinx: vcu: unregister pll_post only if registered correctly * clk-adi: clk: clk-axi-clkgen: fix coding style issues clk: clk-axi-clkgen move to min/max() clk: clk-axi-clkgen: detect axi_clkgen_limits at runtime include: adi-axi-common: add new helper macros include: linux: move adi-axi-common.h out of fpga clk: clk-axi-clkgen: make sure to include mod_devicetable.h clk: clk-axi-clkgen: fix fpfd_max frequency for zynq
7 parents e04c78d + 17a6d7c + 7f5e9ca + f5f792f + ac32d03 + af9019b + c3aa8c7 commit f7887ee

File tree

214 files changed

+2789
-2194
lines changed

Some content is hidden

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

214 files changed

+2789
-2194
lines changed

Documentation/devicetree/bindings/clock/alphascale,acc.txt

Lines changed: 0 additions & 114 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/alphascale,asm9260-clock-controller.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Alphascale Clock Controller
8+
9+
maintainers:
10+
- Oleksij Rempel <[email protected]>
11+
12+
description: |
13+
The ACC (Alphascale Clock Controller) is responsible for choosing proper
14+
clock source, setting dividers and clock gates.
15+
16+
Simple one-cell clock specifier format is used, where the only cell is used
17+
as an index of the clock inside the provider.
18+
It is encouraged to use dt-binding for clock index definitions. SoC specific
19+
dt-binding should be included to the device tree descriptor. For example
20+
Alphascale ASM9260:
21+
22+
#include <dt-bindings/clock/alphascale,asm9260.h>
23+
24+
This binding contains two types of clock providers:
25+
26+
_AHB_ - AHB gate;
27+
_SYS_ - adjustable clock source. Not all peripheral have _SYS_ clock provider.
28+
29+
All clock specific details can be found in the SoC documentation.
30+
31+
properties:
32+
compatible:
33+
const: alphascale,asm9260-clock-controller
34+
35+
reg:
36+
maxItems: 1
37+
38+
'#clock-cells':
39+
const: 1
40+
41+
clocks:
42+
maxItems: 1
43+
44+
required:
45+
- compatible
46+
- reg
47+
- '#clock-cells'
48+
49+
additionalProperties: false
Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/apm,xgene-device-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: APM X-Gene SoC device clocks
8+
9+
maintainers:
10+
- Khuong Dinh <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: apm,xgene-device-clock
15+
16+
reg:
17+
minItems: 1
18+
maxItems: 2
19+
20+
reg-names:
21+
items:
22+
- enum: [ csr-reg, div-reg ]
23+
- const: div-reg
24+
minItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
"#clock-cells":
30+
const: 1
31+
32+
clock-output-names:
33+
maxItems: 1
34+
35+
clock-names:
36+
maxItems: 1
37+
38+
csr-offset:
39+
description: Offset to the CSR reset register
40+
$ref: /schemas/types.yaml#/definitions/uint32
41+
default: 0
42+
43+
csr-mask:
44+
description: CSR reset mask bit
45+
$ref: /schemas/types.yaml#/definitions/uint32
46+
default: 0xf
47+
48+
enable-offset:
49+
description: Offset to the enable register
50+
$ref: /schemas/types.yaml#/definitions/uint32
51+
default: 8
52+
53+
enable-mask:
54+
description: CSR enable mask bit
55+
$ref: /schemas/types.yaml#/definitions/uint32
56+
default: 0xf
57+
58+
divider-offset:
59+
description: Offset to the divider register
60+
$ref: /schemas/types.yaml#/definitions/uint32
61+
default: 0
62+
63+
divider-width:
64+
description: Width of the divider register
65+
$ref: /schemas/types.yaml#/definitions/uint32
66+
default: 0
67+
68+
divider-shift:
69+
description: Bit shift of the divider register
70+
$ref: /schemas/types.yaml#/definitions/uint32
71+
default: 0
72+
73+
required:
74+
- compatible
75+
- reg
76+
- clocks
77+
- '#clock-cells'
78+
- clock-output-names
79+
80+
additionalProperties: false
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/apm,xgene-socpll-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: APM X-Gene SoC PLL, PCPPLL, and PMD clocks
8+
9+
maintainers:
10+
- Khuong Dinh <[email protected]>
11+
12+
properties:
13+
compatible:
14+
items:
15+
- enum:
16+
- apm,xgene-pcppll-clock
17+
- apm,xgene-pcppll-v2-clock
18+
- apm,xgene-pmd-clock
19+
- apm,xgene-socpll-clock
20+
- apm,xgene-socpll-v2-clock
21+
22+
reg:
23+
maxItems: 1
24+
25+
reg-names:
26+
items:
27+
- enum: [ csr-reg, div-reg ]
28+
- const: div-reg
29+
minItems: 1
30+
31+
clocks:
32+
maxItems: 1
33+
34+
clock-names:
35+
enum: [ pcppll, socpll ]
36+
37+
"#clock-cells":
38+
const: 1
39+
40+
clock-output-names:
41+
maxItems: 1
42+
43+
required:
44+
- compatible
45+
- reg
46+
- clocks
47+
- '#clock-cells'
48+
- clock-output-names
49+
50+
additionalProperties: false

Documentation/devicetree/bindings/clock/armada3700-periph-clock.txt

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

Documentation/devicetree/bindings/clock/armada3700-tbg-clock.txt

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

0 commit comments

Comments
 (0)