Skip to content

Commit 9e1343e

Browse files
committed
Merge tag 'v6.1-rockchip-clock1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-rockchip
Pull Rockchip clk driver updates from Heiko Stuebner: - mux-variant clock using the table variant to select parents - clock controller for the rv1126 soc - conversion of rk3128 to yaml and relicensing of the yaml bindings to gpl2+MIT (following dt-binding guildelines) * tag 'v6.1-rockchip-clock1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip: dt-bindings: clock: rockchip: change SPDX-License-Identifier dt-bindings: clock: convert rockchip,rk3128-cru.txt to YAML clk: rockchip: Add clock controller support for RV1126 SoC dt-bindings: clock: rockchip: Document RV1126 CRU clk: rockchip: Add dt-binding header for RV1126 clk: rockchip: Add MUXTBL variant
2 parents 1c23f9e + fffa0fa commit 9e1343e

17 files changed

+1981
-72
lines changed

Documentation/devicetree/bindings/clock/rockchip,px30-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,px30-cru.yaml#

Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,rk3036-cru.yaml#

Documentation/devicetree/bindings/clock/rockchip,rk3128-cru.txt

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/rockchip,rk3128-cru.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip RK3126/RK3128 Clock and Reset Unit (CRU)
8+
9+
maintainers:
10+
- Elaine Zhang <zhangqing@rock-chips.com>
11+
- Heiko Stuebner <heiko@sntech.de>
12+
13+
description: |
14+
The RK3126/RK3128 clock controller generates and supplies clock to various
15+
controllers within the SoC and also implements a reset controller for SoC
16+
peripherals.
17+
Each clock is assigned an identifier and client nodes can use this identifier
18+
to specify the clock which they consume. All available clocks are defined as
19+
preprocessor macros in the dt-bindings/clock/rk3128-cru.h headers and can be
20+
used in device tree sources. Similar macros exist for the reset sources in
21+
these files.
22+
23+
properties:
24+
compatible:
25+
enum:
26+
- rockchip,rk3126-cru
27+
- rockchip,rk3128-cru
28+
29+
reg:
30+
maxItems: 1
31+
32+
"#clock-cells":
33+
const: 1
34+
35+
"#reset-cells":
36+
const: 1
37+
38+
clocks:
39+
minItems: 1
40+
maxItems: 3
41+
42+
clock-names:
43+
minItems: 1
44+
items:
45+
- const: xin24m
46+
- enum:
47+
- ext_i2s
48+
- gmac_clkin
49+
- enum:
50+
- ext_i2s
51+
- gmac_clkin
52+
53+
rockchip,grf:
54+
$ref: /schemas/types.yaml#/definitions/phandle
55+
description:
56+
Phandle to the syscon managing the "general register files" (GRF),
57+
if missing pll rates are not changeable, due to the missing pll
58+
lock status.
59+
60+
required:
61+
- compatible
62+
- reg
63+
- "#clock-cells"
64+
- "#reset-cells"
65+
66+
additionalProperties: false
67+
68+
examples:
69+
- |
70+
cru: clock-controller@20000000 {
71+
compatible = "rockchip,rk3128-cru";
72+
reg = <0x20000000 0x1000>;
73+
rockchip,grf = <&grf>;
74+
#clock-cells = <1>;
75+
#reset-cells = <1>;
76+
};

Documentation/devicetree/bindings/clock/rockchip,rk3228-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,rk3228-cru.yaml#

Documentation/devicetree/bindings/clock/rockchip,rk3288-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,rk3288-cru.yaml#

Documentation/devicetree/bindings/clock/rockchip,rk3308-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,rk3308-cru.yaml#

Documentation/devicetree/bindings/clock/rockchip,rk3368-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,rk3368-cru.yaml#

Documentation/devicetree/bindings/clock/rockchip,rk3399-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0-only
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,rk3399-cru.yaml#

Documentation/devicetree/bindings/clock/rockchip,rv1108-cru.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# SPDX-License-Identifier: GPL-2.0
1+
# SPDX-License-Identifier: (GPL-2.0+ OR MIT)
22
%YAML 1.2
33
---
44
$id: http://devicetree.org/schemas/clock/rockchip,rv1108-cru.yaml#

0 commit comments

Comments
 (0)