Skip to content

Commit 47505bf

Browse files
committed
Merge branches 'clk-kirkwood', 'clk-imx', 'clk-doc', 'clk-zynq' and 'clk-ralink' into clk-next
* clk-kirkwood: clk: kirkwood: Fix a clocking boot regression * clk-imx: clk: imx8mn: Add M7 core clock clk: imx8m: fix clock tree update of TF-A managed clocks clk: imx: clk-divider-gate: Switch to clk_divider.determine_rate clk: imx8mn: use correct mux type for clkout path clk: imx8mm: use correct mux type for clkout path * clk-doc: dt-bindings: clock: samsung: fix header path in example MAINTAINERS: clock: include S3C and S5P in Samsung SoC clock entry dt-bindings: clock: samsung: convert S5Pv210 AudSS to dtschema dt-bindings: clock: samsung: convert Exynos AudSS to dtschema dt-bindings: clock: samsung: convert Exynos4 to dtschema dt-bindings: clock: samsung: convert Exynos3250 to dtschema dt-bindings: clock: samsung: convert Exynos542x to dtschema dt-bindings: clock: samsung: add bindings for Exynos external clock dt-bindings: clock: samsung: convert Exynos5250 to dtschema dt-bindings: clock: brcm,iproc-clocks: fix armpll properties clk: zynqmp: Fix kernel-doc format clk: at91: sama7g5: remove all kernel-doc & kernel-doc warnings clk: zynqmp: fix kernel doc * clk-zynq: clk: zynqmp: Fix a memory leak clk: zynqmp: Check the return type * clk-ralink: clk: ralink: avoid to set 'CLK_IS_CRITICAL' flag for gates
6 parents 8fb59ce + aaedb9e + 3e06191 + 46d4ee4 + e7296d1 + c16edf5 commit 47505bf

27 files changed

+415
-427
lines changed

Documentation/devicetree/bindings/clock/brcm,iproc-clocks.yaml

Lines changed: 25 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,13 +61,30 @@ properties:
6161
maxItems: 1
6262

6363
'#clock-cells':
64-
const: 1
64+
true
6565

6666
clock-output-names:
6767
minItems: 1
6868
maxItems: 45
6969

7070
allOf:
71+
- if:
72+
properties:
73+
compatible:
74+
contains:
75+
enum:
76+
- brcm,cygnus-armpll
77+
- brcm,nsp-armpll
78+
then:
79+
properties:
80+
'#clock-cells':
81+
const: 0
82+
else:
83+
properties:
84+
'#clock-cells':
85+
const: 1
86+
required:
87+
- clock-output-names
7188
- if:
7289
properties:
7390
compatible:
@@ -358,7 +375,6 @@ required:
358375
- reg
359376
- clocks
360377
- '#clock-cells'
361-
- clock-output-names
362378

363379
additionalProperties: false
364380

@@ -392,3 +408,10 @@ examples:
392408
clocks = <&osc2>;
393409
clock-output-names = "keypad", "adc/touch", "pwm";
394410
};
411+
- |
412+
arm_clk@0 {
413+
#clock-cells = <0>;
414+
compatible = "brcm,nsp-armpll";
415+
clocks = <&osc>;
416+
reg = <0x0 0x1000>;
417+
};

Documentation/devicetree/bindings/clock/clk-exynos-audss.txt

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

Documentation/devicetree/bindings/clock/clk-s5pv210-audss.txt

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

Documentation/devicetree/bindings/clock/exynos3250-clock.txt

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

Documentation/devicetree/bindings/clock/exynos4-clock.txt

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

Documentation/devicetree/bindings/clock/exynos5250-clock.txt

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

0 commit comments

Comments
 (0)