Skip to content

Commit 6dff52b

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: "Not a ton of stuff happening in the clk framework. We got some more devm helpers and we seem to be going in the direction of "just turn this stuff on already and leave me alone!" with the addition of a devm_clk_bulk_get_all_enable() API. I'm hoping that we can make that into a pmdomain that drivers attach instead, but this API should help drivers simplify in the meantime. Outside of the devm wrappers, we've got the usual clk driver updates that are dominated by the major phone SoC vendors (Samsung and Qualcomm) and the non-critical driver fixes for things like incorrect topology descriptions and wrong registers or bit fields. More details are below, but I'd say that it looks pretty ordinary. The only thing that really jumps out at me is the Renesas clk driver that's ignoring clks that are assigned to remote processors in DeviceTree. That's a new feature that they're using to avoid marking clks as CLK_IGNORE_UNUSED based on the configuration of the system. Core: - Increase dev_id len for clkdev lookups - Add a devm_clk_bulk_get_all_enable() API to get and enable all clks for a device - Add a devm variant of clk_rate_exclusive_get() New Drivers: - Display, TCSR, GPU, and Camera clock controllers for Qualcomm's X1 Elite SoC - Google GS101 PERIC0 and PERIC1 clock controllers - Exynos850 PDMA clocks - Exynos850 CPU cluster 0 and 1 (CMU_CPUCLK0/CMU_CPUCLK1) clock controllers Removed Drivers: - Remove the unused Qualcomm sc7180 modem clk driver Updates: - Fix some static checker errors in the Hisilicon clk driver - Polarfire MSSPLL hardware has 4 output clocks (the driver supported previously only one output); each of these 4 outputs feed dividers and the output of each divider feed individual hardware blocks (e.g. CAN, Crypto, eMMC); individual hardware block drivers need to control their clocks thus clock driver support was added for all MSSPLL output clocks - Typo fixes in the Qualcomm IPQ5018 GCC driver - Add "qdss_at" clk on Qualcomm IPQ6018, needed for WiFi - Properly terminate frequency tables in different Qualcomm clk drivers - Add MDSS, crypto, and SDCC resets on Qualcomm MSM8953 - Add missing UFS CLKREF clks on Qualcomm SC8180X - Avoid significant delays during boot by adding a softdep on rpmhpd to Qualcomm SDM845 gcc driver - Add QUPv3 RCGS w/ DFS and video resets to Qualcomm SM8150 GCC driver - Fix the custom GPU GX "do-nothing" method in the Qualcomm GDSC driver - Add an external regulator to GX GDSC on Qualcomm SC8280XP GPU clk driver - Switch display, GPU, video, and camera Qualcomm clk drivers to module_platform_driver() - Set a longer delay for Venus resets on many Qualcomm SoCs - Correct the GDSC wait times in the Qualcomm SDM845 display clk driver - Fix clock listing Oops on Amlogic axg - New pll-rate for Rockchip rk3568 - i2s rate improvements for Rockchip rk3399 - Rockchip rk3588 syscon clock fixes and removal of overall clock-number from the rk3588 binding header - A prerequisite for later improvements to the Rockchip rk3588 linked clocks - Minor clean-ups and error handling improvements in both composite-8m and SCU i.MX clock drivers - Fix for SAI_MCLK_SEL definition for i.MX8MP - Register the Samsung CMU MISC clock controller earlier, so the Multi Core Timer clocksource can use it on Google GS101 - Propagate Exynos850 SPI IPCLK rate change to parents, so the SPI will get proper clock rates - Refactor the generic Samsung CPU clock controllers code, preparing it for supporting Exynos850 CPU clocks - Fix some clk kerneldoc warnings - Add Ethernet, SDHI, DMA, and HyperFLASH/QSPI (RPC-IF) clocks on Renesas R-Car V4M - Ignore all clocks which are assigned to a non-Linux system in the Renesas clk driver - Add watchdog clock on Renesas RZ/G3S - Add camera (CRU) clock and reset on Renesas RZ/G2UL - Add support for the Renesas R-Car V4M (R8A779H0) SoC - Convert some clk bindings to YAML so they can be validated" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (150 commits) clk: zynq: Prevent null pointer dereference caused by kmalloc failure clk: fractional-divider: Use bit operations consistently clk: fractional-divider: Move mask calculations out of lock clk: Fix clk_core_get NULL dereference clk: starfive: jh7110-vout: Convert to platform remove callback returning void clk: starfive: jh7110-isp: Convert to platform remove callback returning void clk: imx: imx8-acm: Convert to platform remove callback returning void clk: qcom: gcc-ipq5018: fix register offset for GCC_UBI0_AXI_ARES reset clk: qcom: gcc-ipq5018: fix 'halt_reg' offset of 'gcc_pcie1_pipe_clk' clk: qcom: gcc-ipq5018: fix 'enable_reg' offset of 'gcc_gmac0_sys_clk' clk: qcom: camcc-x1e80100: Fix missing DT_IFACE enum in x1e80100 camcc clk: qcom: mmcc-msm8974: fix terminating of frequency table arrays clk: qcom: mmcc-apq8084: fix terminating of frequency table arrays clk: qcom: camcc-sc8280xp: fix terminating of frequency table arrays clk: qcom: gcc-ipq9574: fix terminating of frequency table arrays clk: qcom: gcc-ipq8074: fix terminating of frequency table arrays clk: qcom: gcc-ipq6018: fix terminating of frequency table arrays clk: qcom: gcc-ipq5018: fix terminating of frequency table arrays clk: mediatek: clk-mt8173-apmixedsys: Use common error handling code in clk_mt8173_apmixed_probe() clk: Add a devm variant of clk_rate_exclusive_get() ...
2 parents eb7cca1 + 3066c52 commit 6dff52b

File tree

158 files changed

+8589
-1666
lines changed

Some content is hidden

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

158 files changed

+8589
-1666
lines changed

CREDITS

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2960,6 +2960,11 @@ S: 2364 Old Trail Drive
29602960
S: Reston, Virginia 20191
29612961
S: USA
29622962

2963+
N: Sekhar Nori
2964+
E: nori.sekhar@gmail.com
2965+
D: Maintainer of Texas Instruments DaVinci machine support, contributor
2966+
D: to device drivers relevant to that SoC family.
2967+
29632968
N: Fredrik Noring
29642969
E: noring@nocrew.org
29652970
W: http://www.lysator.liu.se/~noring/

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

Lines changed: 0 additions & 26 deletions
This file was deleted.

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

Lines changed: 0 additions & 25 deletions
This file was deleted.

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

Lines changed: 0 additions & 25 deletions
This file was deleted.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/mediatek,mt2701-hifsys.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek HIFSYS clock and reset controller
8+
9+
description:
10+
The MediaTek HIFSYS controller provides various clocks and reset outputs to
11+
the system.
12+
13+
maintainers:
14+
- Matthias Brugger <matthias.bgg@gmail.com>
15+
16+
properties:
17+
compatible:
18+
oneOf:
19+
- enum:
20+
- mediatek,mt2701-hifsys
21+
- mediatek,mt7622-hifsys
22+
- items:
23+
- enum:
24+
- mediatek,mt7623-hifsys
25+
- const: mediatek,mt2701-hifsys
26+
27+
reg:
28+
maxItems: 1
29+
30+
"#clock-cells":
31+
const: 1
32+
description: The available clocks are defined in dt-bindings/clock/mt*-clk.h
33+
34+
"#reset-cells":
35+
const: 1
36+
37+
required:
38+
- reg
39+
- "#clock-cells"
40+
41+
additionalProperties: false
42+
43+
examples:
44+
- |
45+
clock-controller@1a000000 {
46+
compatible = "mediatek,mt2701-hifsys";
47+
reg = <0x1a000000 0x1000>;
48+
#clock-cells = <1>;
49+
#reset-cells = <1>;
50+
};
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/mediatek,mt7622-pciesys.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek PCIESYS clock and reset controller
8+
9+
description:
10+
The MediaTek PCIESYS controller provides various clocks to the system.
11+
12+
maintainers:
13+
- Matthias Brugger <matthias.bgg@gmail.com>
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- mediatek,mt7622-pciesys
19+
- mediatek,mt7629-pciesys
20+
21+
reg:
22+
maxItems: 1
23+
24+
"#clock-cells":
25+
const: 1
26+
description: The available clocks are defined in dt-bindings/clock/mt*-clk.h
27+
28+
"#reset-cells":
29+
const: 1
30+
31+
required:
32+
- reg
33+
- "#clock-cells"
34+
- "#reset-cells"
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
clock-controller@1a100800 {
41+
compatible = "mediatek,mt7622-pciesys";
42+
reg = <0x1a100800 0x1000>;
43+
#clock-cells = <1>;
44+
#reset-cells = <1>;
45+
};
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/mediatek,mt7622-ssusbsys.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MediaTek SSUSBSYS clock and reset controller
8+
9+
description:
10+
The MediaTek SSUSBSYS controller provides various clocks to the system.
11+
12+
maintainers:
13+
- Matthias Brugger <matthias.bgg@gmail.com>
14+
15+
properties:
16+
compatible:
17+
enum:
18+
- mediatek,mt7622-ssusbsys
19+
- mediatek,mt7629-ssusbsys
20+
21+
reg:
22+
maxItems: 1
23+
24+
"#clock-cells":
25+
const: 1
26+
description: The available clocks are defined in dt-bindings/clock/mt*-clk.h
27+
28+
"#reset-cells":
29+
const: 1
30+
31+
required:
32+
- reg
33+
- "#clock-cells"
34+
- "#reset-cells"
35+
36+
additionalProperties: false
37+
38+
examples:
39+
- |
40+
clock-controller@1a000000 {
41+
compatible = "mediatek,mt7622-ssusbsys";
42+
reg = <0x1a000000 0x1000>;
43+
#clock-cells = <1>;
44+
#reset-cells = <1>;
45+
};
Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/mobileye,eyeq5-clk.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Mobileye EyeQ5 clock controller
8+
9+
description:
10+
The EyeQ5 clock controller handles 10 read-only PLLs derived from the main
11+
crystal clock. It also exposes one divider clock, a child of one of the PLLs.
12+
Its registers live in a shared region called OLB.
13+
14+
maintainers:
15+
- Grégory Clement <gregory.clement@bootlin.com>
16+
- Théo Lebrun <theo.lebrun@bootlin.com>
17+
- Vladimir Kondratiev <vladimir.kondratiev@mobileye.com>
18+
19+
properties:
20+
compatible:
21+
const: mobileye,eyeq5-clk
22+
23+
reg:
24+
maxItems: 2
25+
26+
reg-names:
27+
items:
28+
- const: plls
29+
- const: ospi
30+
31+
"#clock-cells":
32+
const: 1
33+
34+
clocks:
35+
maxItems: 1
36+
description:
37+
Input parent clock to all PLLs. Expected to be the main crystal.
38+
39+
clock-names:
40+
items:
41+
- const: ref
42+
43+
required:
44+
- compatible
45+
- reg
46+
- reg-names
47+
- "#clock-cells"
48+
- clocks
49+
- clock-names
50+
51+
additionalProperties: false

Documentation/devicetree/bindings/clock/qcom,gpucc.yaml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ properties:
5353
power-domains:
5454
maxItems: 1
5555

56+
vdd-gfx-supply:
57+
description: Regulator supply for the VDD_GFX pads
58+
5659
'#clock-cells':
5760
const: 1
5861

@@ -74,6 +77,12 @@ required:
7477
- '#reset-cells'
7578
- '#power-domain-cells'
7679

80+
# Require that power-domains and vdd-gfx-supply are not both present
81+
not:
82+
required:
83+
- power-domains
84+
- vdd-gfx-supply
85+
7786
additionalProperties: false
7887

7988
examples:

Documentation/devicetree/bindings/clock/qcom,q6sstopcc.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $schema: http://devicetree.org/meta-schemas/core.yaml#
77
title: Q6SSTOP clock Controller
88

99
maintainers:
10-
- Govind Singh <govinds@codeaurora.org>
10+
- Bjorn Andersson <andersson@kernel.org>
1111

1212
properties:
1313
compatible:

0 commit comments

Comments
 (0)