Skip to content

Commit 26bebbf

Browse files
committed
Merge branches 'clk-rockchip', 'clk-renesas', 'clk-microchip', 'clk-allwinner' and 'clk-imx' into clk-next
* clk-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 * clk-renesas: clk: renesas: r8a779g0: Add EtherAVB clocks clk: renesas: r8a779g0: Add PFC/GPIO clocks clk: renesas: r8a779g0: Add I2C clocks clk: renesas: r8a779g0: Add watchdog clock dt-bindings: clock: renesas,rzg2l: Document RZ/Five SoC clk: renesas: r8a779f0: Add MSIOF clocks clk: renesas: r9a09g011: Add IIC clock and reset entries clk: renesas: r9a07g044: Add conditional compilation for r9a07g044_cpg_info clk: renesas: r8a779f0: Add TMU and parent SASYNC clocks clk: renesas: r8a779f0: Add CMT clocks clk: renesas: r8a779f0: Add SDH0 clock * clk-microchip: clk: at91: sama5d2: Add Generic Clocks for UART/USART clk: microchip: add PolarFire SoC fabric clock support dt-bindings: clk: add PolarFire SoC fabric clock ids dt-bindings: clk: document PolarFire SoC fabric clocks dt-bindings: clk: rename mpfs-clkcfg binding clk: microchip: mpfs: update module authorship & licencing clk: microchip: mpfs: convert periph_clk to clk_gate clk: microchip: mpfs: convert cfg_clk to clk_divider clk: microchip: mpfs: delete 2 line mpfs_clk_register_foo() clk: microchip: mpfs: simplify control reg access clk: microchip: mpfs: move id & offset out of clock structs clk: microchip: mpfs: add MSS pll's set & round rate MAINTAINERS: add polarfire soc reset controller reset: add polarfire soc reset support clk: microchip: mpfs: add reset controller dt-bindings: clk: microchip: mpfs: add reset controller support clk: microchip: mpfs: make the rtc's ahb clock critical clk: microchip: mpfs: fix clk_cfg array bounds violation * clk-allwinner: clk: sunxi-ng: ccu-sun9i-a80-usb: Use dev_err_probe() helper clk: sunxi-ng: ccu-sun9i-a80-de: Use dev_err_probe() helper clk: sunxi-ng: sun8i-de2: Use dev_err_probe() helper clk: sunxi-ng: d1: Limit PLL rates to stable ranges * clk-imx: clk: imx: scu: fix memleak on platform_device_add() fails clk: imx93: add SAI IPG clk clk: imx93: add MU1/2 clock clk: imx93: switch to use new clk gate API clk: imx: add i.MX93 clk gate clk: imx: clk-composite-93: check white_list clk: imx: clk-composite-93: check slice busy dt-bindings: clock: imx93-clock: add more MU/SAI clocks dt-bindings: clock: imx8mm: don't use multiple blank lines clk: imx8mp: tune the order of enet_qos_root_clk
6 parents a64b79c + 9e1343e + acb84a1 + 50cf94b + d772c93 + 855ae87 commit 26bebbf

Some content is hidden

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

48 files changed

+3243
-328
lines changed
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/microchip,mpfs-ccc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Microchip PolarFire SoC Fabric Clock Conditioning Circuitry
8+
9+
maintainers:
10+
- Conor Dooley <conor.dooley@microchip.com>
11+
12+
description: |
13+
Microchip PolarFire SoC has 4 Clock Conditioning Circuitry blocks. Each of
14+
these blocks contains two PLLs and 2 DLLs & are located in the four corners of
15+
the FPGA. For more information see "PolarFire SoC FPGA Clocking Resources" at:
16+
https://onlinedocs.microchip.com/pr/GUID-8F0CC4C0-0317-4262-89CA-CE7773ED1931-en-US-1/index.html
17+
18+
properties:
19+
compatible:
20+
const: microchip,mpfs-ccc
21+
22+
reg:
23+
items:
24+
- description: PLL0's control registers
25+
- description: PLL1's control registers
26+
- description: DLL0's control registers
27+
- description: DLL1's control registers
28+
29+
clocks:
30+
description:
31+
The CCC PLL's have two input clocks. It is required that even if the input
32+
clocks are identical that both are provided.
33+
minItems: 2
34+
items:
35+
- description: PLL0's refclk0
36+
- description: PLL0's refclk1
37+
- description: PLL1's refclk0
38+
- description: PLL1's refclk1
39+
- description: DLL0's refclk
40+
- description: DLL1's refclk
41+
42+
clock-names:
43+
minItems: 2
44+
items:
45+
- const: pll0_ref0
46+
- const: pll0_ref1
47+
- const: pll1_ref0
48+
- const: pll1_ref1
49+
- const: dll0_ref
50+
- const: dll1_ref
51+
52+
'#clock-cells':
53+
const: 1
54+
description: |
55+
The clock consumer should specify the desired clock by having the clock
56+
ID in its "clocks" phandle cell.
57+
See include/dt-bindings/clock/microchip,mpfs-clock.h for the full list of
58+
PolarFire clock IDs.
59+
60+
required:
61+
- compatible
62+
- reg
63+
- clocks
64+
- clock-names
65+
- '#clock-cells'
66+
67+
additionalProperties: false
68+
69+
examples:
70+
- |
71+
clock-controller@38100000 {
72+
compatible = "microchip,mpfs-ccc";
73+
reg = <0x38010000 0x1000>, <0x38020000 0x1000>,
74+
<0x39010000 0x1000>, <0x39020000 0x1000>;
75+
#clock-cells = <1>;
76+
clocks = <&refclk_ccc>, <&refclk_ccc>, <&refclk_ccc>, <&refclk_ccc>,
77+
<&refclk_ccc>, <&refclk_ccc>;
78+
clock-names = "pll0_ref0", "pll0_ref1", "pll1_ref0", "pll1_ref1",
79+
"dll0_ref", "dll1_ref";
80+
};

Documentation/devicetree/bindings/clock/microchip,mpfs.yaml renamed to Documentation/devicetree/bindings/clock/microchip,mpfs-clkcfg.yaml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
22
%YAML 1.2
33
---
4-
$id: http://devicetree.org/schemas/clock/microchip,mpfs.yaml#
4+
$id: http://devicetree.org/schemas/clock/microchip,mpfs-clkcfg.yaml#
55
$schema: http://devicetree.org/meta-schemas/core.yaml#
66

77
title: Microchip PolarFire Clock Control Module Binding
@@ -40,8 +40,21 @@ properties:
4040
const: 1
4141
description: |
4242
The clock consumer should specify the desired clock by having the clock
43-
ID in its "clocks" phandle cell. See include/dt-bindings/clock/microchip,mpfs-clock.h
44-
for the full list of PolarFire clock IDs.
43+
ID in its "clocks" phandle cell.
44+
See include/dt-bindings/clock/microchip,mpfs-clock.h for the full list of
45+
PolarFire clock IDs.
46+
47+
resets:
48+
maxItems: 1
49+
50+
'#reset-cells':
51+
description:
52+
The AHB/AXI peripherals on the PolarFire SoC have reset support, so from
53+
CLK_ENVM to CLK_CFM. The reset consumer should specify the desired
54+
peripheral via the clock ID in its "resets" phandle cell.
55+
See include/dt-bindings/clock/microchip,mpfs-clock.h for the full list of
56+
PolarFire clock IDs.
57+
const: 1
4558

4659
required:
4760
- compatible

Documentation/devicetree/bindings/clock/renesas,rzg2l-cpg.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ description: |
2424
properties:
2525
compatible:
2626
enum:
27-
- renesas,r9a07g043-cpg # RZ/G2UL{Type-1,Type-2}
27+
- renesas,r9a07g043-cpg # RZ/G2UL{Type-1,Type-2} and RZ/Five
2828
- renesas,r9a07g044-cpg # RZ/G2{L,LC}
2929
- renesas,r9a07g054-cpg # RZ/V2L
3030
- renesas,r9a09g011-cpg # RZ/V2M

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#

0 commit comments

Comments
 (0)