Skip to content

Commit 3ce2e14

Browse files
committed
Merge branches 'clk-rockchip', 'clk-samsung' and 'clk-imx' into clk-next
* clk-rockchip: dt-bindings: reset: fix double id on rk3562-cru reset ids clk: rockchip: Add clock controller for the RK3562 dt-bindings: clock: Add RK3562 cru clk: rockchip: rk3528: Add reset lookup table clk: rockchip: Add clock controller driver for RK3528 SoC clk: rockchip: Add PLL flag ROCKCHIP_PLL_FIXED_MODE dt-bindings: clock: Document clock and reset unit of RK3528 clk: rockchip: rk3328: fix wrong clk_ref_usb3otg parent clk: rockchip: rk3568: mark hclk_vi as critical clk: rockchip: rk3188: use PCLK_CIF0/1 clock IDs on RK3066 dt-bindings: clock: rk3188-common: add PCLK_CIF0/PCLK_CIF1 * clk-samsung: clk: samsung: Drop unused clk.h and of.h headers clk: samsung: Add missing mod_devicetable.h header clk: samsung: add initial exynos7870 clock driver clk: samsung: introduce Exynos2200 clock driver clk: samsung: clk-pll: add support for pll_4311 dt-bindings: clock: add clock definitions and documentation for exynos7870 CMU dt-bindings: clock: add Exynos2200 SoC clk: samsung: Fix UBSAN panic in samsung_clk_init() clk: samsung: Fix spelling mistake "stablization" -> "stabilization" clk: samsung: exynos990: Add CMU_PERIS block dt-bindings: clock: exynos990: Add CMU_PERIS block * clk-imx: clk: imx8mp: inform CCF of maximum frequency of clocks dt-bindings: clock: imx8m: document nominal/overdrive properties clk: clk-imx8mp-audiomix: fix dsp/ocram_a clock parents dt-bindings: clock: imx8mp: add axi clock
4 parents 316f4b9 + 9d484ea + 4defb93 + 8fbf3d4 commit 3ce2e14

Some content is hidden

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

59 files changed

+11992
-42
lines changed

Documentation/devicetree/bindings/clock/imx8m-clock.yaml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ properties:
4343
ID in its "clocks" phandle cell. See include/dt-bindings/clock/imx8m-clock.h
4444
for the full list of i.MX8M clock IDs.
4545

46+
fsl,operating-mode:
47+
$ref: /schemas/types.yaml#/definitions/string
48+
enum: [nominal, overdrive]
49+
description:
50+
The operating mode of the SoC. This affects the maximum clock rates that
51+
can safely be configured by the clock controller.
52+
4653
required:
4754
- compatible
4855
- reg
@@ -109,6 +116,7 @@ examples:
109116
<&clk_ext3>, <&clk_ext4>;
110117
clock-names = "osc_32k", "osc_24m", "clk_ext1", "clk_ext2",
111118
"clk_ext3", "clk_ext4";
119+
fsl,operating-mode = "nominal";
112120
};
113121
114122
- |

Documentation/devicetree/bindings/clock/imx8mp-audiomix.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ properties:
2424
maxItems: 1
2525

2626
clocks:
27-
minItems: 7
28-
maxItems: 7
27+
minItems: 8
28+
maxItems: 8
2929

3030
clock-names:
3131
items:
@@ -36,6 +36,7 @@ properties:
3636
- const: sai5
3737
- const: sai6
3838
- const: sai7
39+
- const: axi
3940

4041
'#clock-cells':
4142
const: 1
@@ -72,10 +73,11 @@ examples:
7273
<&clk IMX8MP_CLK_SAI3>,
7374
<&clk IMX8MP_CLK_SAI5>,
7475
<&clk IMX8MP_CLK_SAI6>,
75-
<&clk IMX8MP_CLK_SAI7>;
76+
<&clk IMX8MP_CLK_SAI7>,
77+
<&clk IMX8MP_CLK_AUDIO_AXI_ROOT>;
7678
clock-names = "ahb",
7779
"sai1", "sai2", "sai3",
78-
"sai5", "sai6", "sai7";
80+
"sai5", "sai6", "sai7", "axi";
7981
power-domains = <&pgc_audio>;
8082
};
8183
Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/rockchip,rk3528-cru.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip RK3528 Clock and Reset Controller
8+
9+
maintainers:
10+
- Yao Zi <ziyao@disroot.org>
11+
12+
description: |
13+
The RK3528 clock controller generates the clock and also implements a reset
14+
controller for SoC peripherals. For example, it provides SCLK_UART0 and
15+
PCLK_UART0 as well as SRST_P_UART0 and SRST_S_UART0 for the first UART
16+
module.
17+
Each clock is assigned an identifier, consumer nodes can use it to specify
18+
the clock. All available clock and reset IDs are defined in dt-binding
19+
headers.
20+
21+
properties:
22+
compatible:
23+
const: rockchip,rk3528-cru
24+
25+
reg:
26+
maxItems: 1
27+
28+
clocks:
29+
items:
30+
- description: External 24MHz oscillator clock
31+
- description: >
32+
50MHz clock generated by PHY module, for generating GMAC0 clocks only.
33+
34+
clock-names:
35+
items:
36+
- const: xin24m
37+
- const: gmac0
38+
39+
"#clock-cells":
40+
const: 1
41+
42+
"#reset-cells":
43+
const: 1
44+
45+
required:
46+
- compatible
47+
- reg
48+
- clocks
49+
- clock-names
50+
- "#clock-cells"
51+
- "#reset-cells"
52+
53+
additionalProperties: false
54+
55+
examples:
56+
- |
57+
clock-controller@ff4a0000 {
58+
compatible = "rockchip,rk3528-cru";
59+
reg = <0xff4a0000 0x30000>;
60+
clocks = <&xin24m>, <&gmac0_clk>;
61+
clock-names = "xin24m", "gmac0";
62+
#clock-cells = <1>;
63+
#reset-cells = <1>;
64+
};
Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/rockchip,rk3562-cru.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip rk3562 Clock and Reset Control Module
8+
9+
maintainers:
10+
- Elaine Zhang <zhangqing@rock-chips.com>
11+
- Heiko Stuebner <heiko@sntech.de>
12+
13+
description:
14+
The RK3562 clock controller generates the clock and also implements a reset
15+
controller for SoC peripherals. For example it provides SCLK_UART2 and
16+
PCLK_UART2, as well as SRST_P_UART2 and SRST_S_UART2 for the second UART
17+
module.
18+
19+
properties:
20+
compatible:
21+
const: rockchip,rk3562-cru
22+
23+
reg:
24+
maxItems: 1
25+
26+
"#clock-cells":
27+
const: 1
28+
29+
"#reset-cells":
30+
const: 1
31+
32+
clocks:
33+
maxItems: 2
34+
35+
clock-names:
36+
items:
37+
- const: xin24m
38+
- const: xin32k
39+
40+
required:
41+
- compatible
42+
- reg
43+
- "#clock-cells"
44+
- "#reset-cells"
45+
46+
additionalProperties: false
47+
48+
examples:
49+
- |
50+
clock-controller@ff100000 {
51+
compatible = "rockchip,rk3562-cru";
52+
reg = <0xff100000 0x40000>;
53+
#clock-cells = <1>;
54+
#reset-cells = <1>;
55+
};

0 commit comments

Comments
 (0)