Skip to content

Commit caf0dce

Browse files
committed
Merge tag 'clk-meson-v6.6-1' of https://github.com/BayLibre/clk-meson into clk-amlogic
Pull Amlogic clk driver updates from Jerome Brunet: - dt-bindings: expose all Amlogic clock ids - Migrate Amlogic gxbb clock controllers dt-bindings to schema * tag 'clk-meson-v6.6-1' of https://github.com/BayLibre/clk-meson: (22 commits) dt-bindings: soc: amlogic: document System Control registers dt-bindings: clock: amlogic: convert amlogic,gxbb-aoclkc.txt to dt-schema dt-bindings: clock: amlogic: convert amlogic,gxbb-clkc.txt to dt-schema clk: meson: axg-audio: move bindings include to main driver clk: meson: meson8b: move bindings include to main driver clk: meson: a1: move bindings include to main driver clk: meson: eeclk: move bindings include to main driver clk: meson: aoclk: move bindings include to main driver dt-bindings: clk: axg-audio-clkc: expose all clock ids dt-bindings: clk: amlogic,a1-pll-clkc: expose all clock ids dt-bindings: clk: amlogic,a1-peripherals-clkc: expose all clock ids dt-bindings: clk: meson8b-clkc: expose all clock ids dt-bindings: clk: g12a-aoclkc: expose all clock ids dt-bindings: clk: g12a-clks: expose all clock ids dt-bindings: clk: axg-clkc: expose all clock ids dt-bindings: clk: gxbb-clkc: expose all clock ids clk: meson: migrate axg-audio out of hw_onecell_data to drop NR_CLKS clk: meson: migrate meson8b out of hw_onecell_data to drop NR_CLKS clk: meson: migrate a1 clock drivers out of hw_onecell_data to drop NR_CLKS clk: meson: migrate meson-aoclk out of hw_onecell_data to drop NR_CLKS ...
2 parents 06c2afb + 4d023be commit caf0dce

Some content is hidden

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

41 files changed

+3471
-3396
lines changed

Documentation/devicetree/bindings/clock/amlogic,gxbb-aoclkc.txt

Lines changed: 0 additions & 64 deletions
This file was deleted.
Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,85 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/amlogic,gxbb-aoclkc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Always-On Clock Controller
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
properties:
13+
compatible:
14+
oneOf:
15+
- items:
16+
- enum:
17+
- amlogic,meson-gxbb-aoclkc
18+
- amlogic,meson-gxl-aoclkc
19+
- amlogic,meson-gxm-aoclkc
20+
- amlogic,meson-axg-aoclkc
21+
- const: amlogic,meson-gx-aoclkc
22+
- enum:
23+
- amlogic,meson-axg-aoclkc
24+
- amlogic,meson-g12a-aoclkc
25+
26+
clocks:
27+
minItems: 2
28+
maxItems: 5
29+
30+
clock-names:
31+
minItems: 2
32+
items:
33+
- const: xtal
34+
- const: mpeg-clk
35+
- const: ext-32k-0
36+
- const: ext-32k-1
37+
- const: ext-32k-2
38+
39+
'#clock-cells':
40+
const: 1
41+
42+
'#reset-cells':
43+
const: 1
44+
45+
required:
46+
- compatible
47+
- clocks
48+
- clock-names
49+
- '#clock-cells'
50+
- '#reset-cells'
51+
52+
allOf:
53+
- if:
54+
properties:
55+
compatible:
56+
enum:
57+
- amlogic,meson-g12a-aoclkc
58+
59+
then:
60+
properties:
61+
clocks:
62+
minItems: 2
63+
maxItems: 3
64+
65+
clock-names:
66+
minItems: 2
67+
maxItems: 3
68+
69+
- if:
70+
properties:
71+
compatible:
72+
enum:
73+
- amlogic,meson-gxl-aoclkc
74+
- amlogic,meson-gxm-aoclkc
75+
- amlogic,meson-axg-aoclkc
76+
77+
then:
78+
properties:
79+
clocks:
80+
maxItems: 2
81+
82+
clock-names:
83+
maxItems: 2
84+
85+
additionalProperties: false

Documentation/devicetree/bindings/clock/amlogic,gxbb-clkc.txt

Lines changed: 0 additions & 53 deletions
This file was deleted.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/amlogic,gxbb-clkc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Amlogic Clock Controller
8+
9+
maintainers:
10+
- Neil Armstrong <neil.armstrong@linaro.org>
11+
12+
properties:
13+
compatible:
14+
enum:
15+
- amlogic,gxbb-clkc
16+
- amlogic,gxl-clkc
17+
- amlogic,axg-clkc
18+
- amlogic,g12a-clkc
19+
- amlogic,g12b-clkc
20+
- amlogic,sm1-clkc
21+
22+
clocks:
23+
maxItems: 1
24+
25+
clock-names:
26+
const: xtal
27+
28+
'#clock-cells':
29+
const: 1
30+
31+
required:
32+
- compatible
33+
- clocks
34+
- clock-names
35+
- '#clock-cells'
36+
37+
additionalProperties: false

0 commit comments

Comments
 (0)