Skip to content

Commit 75d6e7d

Browse files
committed
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux
Pull clk updates from Stephen Boyd: "Nothing changed in the clk framework core this time around. We did get some updates to the basic clk types to use determine_rate for the divider type and add a power of two fractional divider flag though. Otherwise, this is a collection of clk driver updates. More than half the diffstat is in the Qualcomm clk driver where we add a bunch of data to describe clks on various SoCs and fix bugs. The other big new thing in here is the Mediatek MT8192 clk driver. That's been under review for a while and it's nice to see that it's finally upstream. Beyond that it's the usual set of minor fixes and tweaks to clk drivers. There are some non-clk driver bits in here which have all been acked by the respective maintainers. New Drivers: - Support video, gpu, display clks on qcom sc7280 SoCs - GCC clks on qcom MSM8953, SM4250/6115, and SM6350 SoCs - Multimedia clks (MMCC) on qcom MSM8994/MSM8992 - RPMh clks on qcom SM6350 SoCs - Support for Mediatek MT8192 SoCs - Add display (DU and DSI) clocks on Renesas R-Car V3U - Add I2C, DMAC, USB, sound (SSIF-2), GPIO, CANFD, and ADC clocks and resets on Renesas RZ/G2L Updates: - Support the SD/OE pin on IDT VersaClock 5 and 6 clock generators - Add power of two flag to fractional divider clk type - Migrate some clk drivers to clk_divider_ops.determine_rate - Migrate to clk_parent_data in gcc-sdm660 - Fix CLKOUT clocks on i.MX8MM and i.MX8MN by using imx_clk_hw_mux2 - Switch from .round_rate to .determine_rate in clk-divider-gate - Fix clock tree update for TF-A controlled clocks for all i.MX8M - Add missing M7 core clock for i.MX8MN - YAML conversion of rk3399 clock controller binding - Removal of GRF dependency for the rk3328/rk3036 pll types - Drop CLK_IS_CRITICAL flag from Tegra fuse clk - Make CLK_R9A06G032 Kconfig symbol invisible - Convert various DT bindings to YAML" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (128 commits) dt-bindings: clock: samsung: fix header path in example clk: tegra: fix old-style declaration clk: qcom: Add SM6350 GCC driver 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 clk: vc5: Add properties for configuring SD/OE behavior clk: vc5: Use dev_err_probe dt-bindings: clk: vc5: Add properties for configuring the SD/OE pin dt-bindings: clock: brcm,iproc-clocks: fix armpll properties clk: zynqmp: Fix kernel-doc format clk: at91: clk-generated: Limit the requested rate to our range clk: ralink: avoid to set 'CLK_IS_CRITICAL' flag for gates clk: zynqmp: Fix a memory leak clk: zynqmp: Check the return type ...
2 parents a180eab + 47505bf commit 75d6e7d

File tree

140 files changed

+20771
-1045
lines changed

Some content is hidden

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

140 files changed

+20771
-1045
lines changed

Documentation/devicetree/bindings/arm/mediatek/mediatek,audsys.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Required Properties:
1313
- "mediatek,mt7623-audsys", "mediatek,mt2701-audsys", "syscon"
1414
- "mediatek,mt8167-audiosys", "syscon"
1515
- "mediatek,mt8183-audiosys", "syscon"
16+
- "mediatek,mt8192-audsys", "syscon"
1617
- "mediatek,mt8516-audsys", "syscon"
1718
- #clock-cells: Must be 1
1819

Documentation/devicetree/bindings/arm/mediatek/mediatek,mmsys.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ properties:
2929
- mediatek,mt8167-mmsys
3030
- mediatek,mt8173-mmsys
3131
- mediatek,mt8183-mmsys
32+
- mediatek,mt8192-mmsys
3233
- mediatek,mt8365-mmsys
3334
- const: syscon
3435
- items:
Lines changed: 199 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,199 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mt8192-clock.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: MediaTek Functional Clock Controller for MT8192
8+
9+
maintainers:
10+
- Chun-Jie Chen <[email protected]>
11+
12+
description:
13+
The Mediatek functional clock controller provides various clocks on MT8192.
14+
15+
properties:
16+
compatible:
17+
items:
18+
- enum:
19+
- mediatek,mt8192-scp_adsp
20+
- mediatek,mt8192-imp_iic_wrap_c
21+
- mediatek,mt8192-imp_iic_wrap_e
22+
- mediatek,mt8192-imp_iic_wrap_s
23+
- mediatek,mt8192-imp_iic_wrap_ws
24+
- mediatek,mt8192-imp_iic_wrap_w
25+
- mediatek,mt8192-imp_iic_wrap_n
26+
- mediatek,mt8192-msdc_top
27+
- mediatek,mt8192-msdc
28+
- mediatek,mt8192-mfgcfg
29+
- mediatek,mt8192-imgsys
30+
- mediatek,mt8192-imgsys2
31+
- mediatek,mt8192-vdecsys_soc
32+
- mediatek,mt8192-vdecsys
33+
- mediatek,mt8192-vencsys
34+
- mediatek,mt8192-camsys
35+
- mediatek,mt8192-camsys_rawa
36+
- mediatek,mt8192-camsys_rawb
37+
- mediatek,mt8192-camsys_rawc
38+
- mediatek,mt8192-ipesys
39+
- mediatek,mt8192-mdpsys
40+
41+
reg:
42+
maxItems: 1
43+
44+
'#clock-cells':
45+
const: 1
46+
47+
required:
48+
- compatible
49+
- reg
50+
51+
additionalProperties: false
52+
53+
examples:
54+
- |
55+
scp_adsp: clock-controller@10720000 {
56+
compatible = "mediatek,mt8192-scp_adsp";
57+
reg = <0x10720000 0x1000>;
58+
#clock-cells = <1>;
59+
};
60+
61+
- |
62+
imp_iic_wrap_c: clock-controller@11007000 {
63+
compatible = "mediatek,mt8192-imp_iic_wrap_c";
64+
reg = <0x11007000 0x1000>;
65+
#clock-cells = <1>;
66+
};
67+
68+
- |
69+
imp_iic_wrap_e: clock-controller@11cb1000 {
70+
compatible = "mediatek,mt8192-imp_iic_wrap_e";
71+
reg = <0x11cb1000 0x1000>;
72+
#clock-cells = <1>;
73+
};
74+
75+
- |
76+
imp_iic_wrap_s: clock-controller@11d03000 {
77+
compatible = "mediatek,mt8192-imp_iic_wrap_s";
78+
reg = <0x11d03000 0x1000>;
79+
#clock-cells = <1>;
80+
};
81+
82+
- |
83+
imp_iic_wrap_ws: clock-controller@11d23000 {
84+
compatible = "mediatek,mt8192-imp_iic_wrap_ws";
85+
reg = <0x11d23000 0x1000>;
86+
#clock-cells = <1>;
87+
};
88+
89+
- |
90+
imp_iic_wrap_w: clock-controller@11e01000 {
91+
compatible = "mediatek,mt8192-imp_iic_wrap_w";
92+
reg = <0x11e01000 0x1000>;
93+
#clock-cells = <1>;
94+
};
95+
96+
- |
97+
imp_iic_wrap_n: clock-controller@11f02000 {
98+
compatible = "mediatek,mt8192-imp_iic_wrap_n";
99+
reg = <0x11f02000 0x1000>;
100+
#clock-cells = <1>;
101+
};
102+
103+
- |
104+
msdc_top: clock-controller@11f10000 {
105+
compatible = "mediatek,mt8192-msdc_top";
106+
reg = <0x11f10000 0x1000>;
107+
#clock-cells = <1>;
108+
};
109+
110+
- |
111+
msdc: clock-controller@11f60000 {
112+
compatible = "mediatek,mt8192-msdc";
113+
reg = <0x11f60000 0x1000>;
114+
#clock-cells = <1>;
115+
};
116+
117+
- |
118+
mfgcfg: clock-controller@13fbf000 {
119+
compatible = "mediatek,mt8192-mfgcfg";
120+
reg = <0x13fbf000 0x1000>;
121+
#clock-cells = <1>;
122+
};
123+
124+
- |
125+
imgsys: clock-controller@15020000 {
126+
compatible = "mediatek,mt8192-imgsys";
127+
reg = <0x15020000 0x1000>;
128+
#clock-cells = <1>;
129+
};
130+
131+
- |
132+
imgsys2: clock-controller@15820000 {
133+
compatible = "mediatek,mt8192-imgsys2";
134+
reg = <0x15820000 0x1000>;
135+
#clock-cells = <1>;
136+
};
137+
138+
- |
139+
vdecsys_soc: clock-controller@1600f000 {
140+
compatible = "mediatek,mt8192-vdecsys_soc";
141+
reg = <0x1600f000 0x1000>;
142+
#clock-cells = <1>;
143+
};
144+
145+
- |
146+
vdecsys: clock-controller@1602f000 {
147+
compatible = "mediatek,mt8192-vdecsys";
148+
reg = <0x1602f000 0x1000>;
149+
#clock-cells = <1>;
150+
};
151+
152+
- |
153+
vencsys: clock-controller@17000000 {
154+
compatible = "mediatek,mt8192-vencsys";
155+
reg = <0x17000000 0x1000>;
156+
#clock-cells = <1>;
157+
};
158+
159+
- |
160+
camsys: clock-controller@1a000000 {
161+
compatible = "mediatek,mt8192-camsys";
162+
reg = <0x1a000000 0x1000>;
163+
#clock-cells = <1>;
164+
};
165+
166+
- |
167+
camsys_rawa: clock-controller@1a04f000 {
168+
compatible = "mediatek,mt8192-camsys_rawa";
169+
reg = <0x1a04f000 0x1000>;
170+
#clock-cells = <1>;
171+
};
172+
173+
- |
174+
camsys_rawb: clock-controller@1a06f000 {
175+
compatible = "mediatek,mt8192-camsys_rawb";
176+
reg = <0x1a06f000 0x1000>;
177+
#clock-cells = <1>;
178+
};
179+
180+
- |
181+
camsys_rawc: clock-controller@1a08f000 {
182+
compatible = "mediatek,mt8192-camsys_rawc";
183+
reg = <0x1a08f000 0x1000>;
184+
#clock-cells = <1>;
185+
};
186+
187+
- |
188+
ipesys: clock-controller@1b000000 {
189+
compatible = "mediatek,mt8192-ipesys";
190+
reg = <0x1b000000 0x1000>;
191+
#clock-cells = <1>;
192+
};
193+
194+
- |
195+
mdpsys: clock-controller@1f000000 {
196+
compatible = "mediatek,mt8192-mdpsys";
197+
reg = <0x1f000000 0x1000>;
198+
#clock-cells = <1>;
199+
};
Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,65 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mt8192-sys-clock.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: MediaTek System Clock Controller for MT8192
8+
9+
maintainers:
10+
- Chun-Jie Chen <[email protected]>
11+
12+
description:
13+
The Mediatek system clock controller provides various clocks and system configuration
14+
like reset and bus protection on MT8192.
15+
16+
properties:
17+
compatible:
18+
items:
19+
- enum:
20+
- mediatek,mt8192-topckgen
21+
- mediatek,mt8192-infracfg
22+
- mediatek,mt8192-pericfg
23+
- mediatek,mt8192-apmixedsys
24+
- const: syscon
25+
26+
reg:
27+
maxItems: 1
28+
29+
'#clock-cells':
30+
const: 1
31+
32+
required:
33+
- compatible
34+
- reg
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
topckgen: syscon@10000000 {
41+
compatible = "mediatek,mt8192-topckgen", "syscon";
42+
reg = <0x10000000 0x1000>;
43+
#clock-cells = <1>;
44+
};
45+
46+
- |
47+
infracfg: syscon@10001000 {
48+
compatible = "mediatek,mt8192-infracfg", "syscon";
49+
reg = <0x10001000 0x1000>;
50+
#clock-cells = <1>;
51+
};
52+
53+
- |
54+
pericfg: syscon@10003000 {
55+
compatible = "mediatek,mt8192-pericfg", "syscon";
56+
reg = <0x10003000 0x1000>;
57+
#clock-cells = <1>;
58+
};
59+
60+
- |
61+
apmixedsys: syscon@1000c000 {
62+
compatible = "mediatek,mt8192-apmixedsys", "syscon";
63+
reg = <0x1000c000 0x1000>;
64+
#clock-cells = <1>;
65+
};

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+
};

0 commit comments

Comments
 (0)