Skip to content

Commit 28b9aaa

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: "This is all driver updates, the majority of which is a bunch of new Qualcomm clk drivers that dominate the diffstat because we add support for six SoCs from that particular vendor. The other big change is the removal of various clk drivers that are no longer used now that the kernel is dropping support for those SoCs. Beyond that there's the usual non-critical fixes for existing drivers and a good number of patches from Lee Jones that cleanup a bunch of W=1 enabled builds. Removed Drivers: - Remove efm32 clk driver - Remove tango4 clk driver - Remove zte zx clk driver - Remove sirf prima2/atlast clk drivers - Remove u300 clk driver New Drivers: - PLL support on MStar/SigmaStar ARMv7 SoCs - CPU clks for Qualcomm SDX55 - GCC and RPMh clks for Qualcomm SC8180x and SC7280 SoCs - GCC clks for Qualcomm SM8350 - GPU clks for Qualcomm SDM660/SDM630 Updates: - Video clk fixups on Qualcomm SM8250 - Improvements for multimedia clks on Qualcomm MSM8998 - Fix many warnings with W=1 enabled builds under drivers/clk/ - Support crystal load capacitance for Versaclock VC5 - Add a "skip recall" DT binding for Silicon Labs' si570 to avoid glitches at boot - Convert Xilinx VCU clk driver to a proper clk provider driver - Expose Xilinx ZynqMP clk driver to more platforms - Amlogic pll driver fixup - Amlogic meson8b clock controller dt support clean up - Remove mipi clk from the Amlogic axg clock controller - New Rockchip rk3368 clock ids related to camera input - Use pr_notice() instead of pr_warn() on i.MX6Q pre-boot ldb_di_clk reparenting - A series from Liu Ying that adds some SCU clocks support for i.MX8qxp DC0/MIPI-LVDS subsystems - A series from Lucas Stach that adds PLL monitor clocks for i.MX8MQ, and clkout1/2 support for i.MX8MM/MN - Add I2c and Ethernet (RAVB) clocks on Renesas R-Car V3U - Add timer (TMU) clocks on most Renesas R-Car Gen3 SoCs - Add video-related (FCPVD/VSPD/VSPX), watchdog (RWDT), serial (HSCIF), pincontrol/GPIO (PFC/GPIO), SPI (MSIOF), SDHI, and DMA (SYS-DMAC) clocks on Renesas R-Car V3U - Add support for the USB 2.0 clock selector on Renesas RZ/G2 SoCs - Allwinner H616 SoC clk support" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (171 commits) clk: mstar: msc313-mpll: Fix format specifier clk: mstar: Allow MStar clk drivers to be compile tested clk: qoriq: use macros to generate pll_mask clk: qcom: Add Global Clock controller (GCC) driver for SC7280 dt-bindings: clock: Add SC7280 GCC clock binding clk: qcom: rpmh: Add support for RPMH clocks on SC7280 dt-bindings: clock: Add RPMHCC bindings for SC7280 clk: qcom: gcc-sm8350: add gdsc dt-bindings: clock: Add QCOM SDM630 and SDM660 graphics clock bindings clk: qcom: Add SDM660 GPU Clock Controller (GPUCC) driver clk: qcom: mmcc-msm8996: Migrate gfx3d clock to clk_rcg2_gfx3d clk: qcom: rcg2: Stop hardcoding gfx3d pingpong parent numbers dt-bindings: clock: Add support for the SDM630 and SDM660 mmcc clk: qcom: Add SDM660 Multimedia Clock Controller (MMCC) driver clk: qcom: gcc-sdm660: Mark GPU CFG AHB clock as critical clk: qcom: gcc-sdm660: Mark MMSS NoC CFG AHB clock as critical clk: qcom: gpucc-msm8998: Allow fabia gpupll0 rate setting clk: qcom: gpucc-msm8998: Add resets, cxc, fix flags on gpu_gx_gdsc clk: qcom: gdsc: Implement NO_RET_PERIPH flag clk: mstar: MStar/SigmaStar MPLL driver ...
2 parents 5d26c17 + 4d5c4ae commit 28b9aaa

File tree

195 files changed

+21291
-8994
lines changed

Some content is hidden

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

195 files changed

+21291
-8994
lines changed

Documentation/devicetree/bindings/clock/adi,axi-clkgen.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ properties:
2020
compatible:
2121
enum:
2222
- adi,axi-clkgen-2.00.a
23+
- adi,zynqmp-axi-clkgen-2.00.a
2324

2425
clocks:
2526
description:

Documentation/devicetree/bindings/clock/allwinner,sun4i-a10-ccu.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ properties:
4141
- allwinner,sun50i-h5-ccu
4242
- allwinner,sun50i-h6-ccu
4343
- allwinner,sun50i-h6-r-ccu
44+
- allwinner,sun50i-h616-ccu
45+
- allwinner,sun50i-h616-r-ccu
4446
- allwinner,suniv-f1c100s-ccu
4547
- nextthing,gr8-ccu
4648

@@ -82,6 +84,7 @@ if:
8284
- allwinner,sun50i-a64-r-ccu
8385
- allwinner,sun50i-a100-r-ccu
8486
- allwinner,sun50i-h6-r-ccu
87+
- allwinner,sun50i-h616-r-ccu
8588

8689
then:
8790
properties:
@@ -100,6 +103,7 @@ else:
100103
enum:
101104
- allwinner,sun50i-a100-ccu
102105
- allwinner,sun50i-h6-ccu
106+
- allwinner,sun50i-h616-ccu
103107

104108
then:
105109
properties:

Documentation/devicetree/bindings/clock/csr,atlas7-car.txt

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

Documentation/devicetree/bindings/clock/idt,versaclock5.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,12 @@ properties:
5959
minItems: 1
6060
maxItems: 2
6161

62+
idt,xtal-load-femtofarads:
63+
$ref: /schemas/types.yaml#/definitions/uint32
64+
minimum: 9000
65+
maximum: 22760
66+
description: Optional load capacitor for XTAL1 and XTAL2
67+
6268
patternProperties:
6369
"^OUT[1-4]$":
6470
type: object

Documentation/devicetree/bindings/clock/imx27-clock.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: Clock bindings for Freescale i.MX27
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@nxp.com>
10+
- Fabio Estevam <festevam@gmail.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

Documentation/devicetree/bindings/clock/imx31-clock.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: Clock bindings for Freescale i.MX31
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@nxp.com>
10+
- Fabio Estevam <festevam@gmail.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock

Documentation/devicetree/bindings/clock/imx5-clock.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: Clock bindings for Freescale i.MX5
88

99
maintainers:
10-
- Fabio Estevam <fabio.estevam@nxp.com>
10+
- Fabio Estevam <festevam@gmail.com>
1111

1212
description: |
1313
The clock consumer should specify the desired clock by having the clock
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/intel,easic-n5x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Intel SoCFPGA eASIC N5X platform clock controller binding
8+
9+
maintainers:
10+
- Dinh Nguyen <[email protected]>
11+
12+
description:
13+
The Intel eASIC N5X Clock controller is an integrated clock controller, which
14+
generates and supplies to all modules.
15+
16+
properties:
17+
compatible:
18+
const: intel,easic-n5x-clkmgr
19+
20+
'#clock-cells':
21+
const: 1
22+
23+
reg:
24+
maxItems: 1
25+
26+
clocks:
27+
maxItems: 1
28+
29+
required:
30+
- compatible
31+
- reg
32+
- clocks
33+
- '#clock-cells'
34+
35+
additionalProperties: false
36+
37+
examples:
38+
# Clock controller node:
39+
- |
40+
clkmgr: clock-controller@ffd10000 {
41+
compatible = "intel,easic-n5x-clkmgr";
42+
reg = <0xffd10000 0x1000>;
43+
clocks = <&osc1>;
44+
#clock-cells = <1>;
45+
};
46+
...
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/mstar,msc313-mpll.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: MStar/Sigmastar MSC313 MPLL
8+
9+
maintainers:
10+
- Daniel Palmer <[email protected]>
11+
12+
description: |
13+
The MStar/SigmaStar MSC313 and later ARMv7 chips have an MPLL block that
14+
takes the external xtal input and multiplies it to create a high
15+
frequency clock and divides that down into a number of clocks that
16+
peripherals use.
17+
18+
properties:
19+
compatible:
20+
const: mstar,msc313-mpll
21+
22+
"#clock-cells":
23+
const: 1
24+
25+
clocks:
26+
maxItems: 1
27+
28+
reg:
29+
maxItems: 1
30+
31+
required:
32+
- compatible
33+
- "#clock-cells"
34+
- clocks
35+
- reg
36+
37+
additionalProperties: false
38+
39+
examples:
40+
- |
41+
mpll@206000 {
42+
compatible = "mstar,msc313-mpll";
43+
reg = <0x206000 0x200>;
44+
#clock-cells = <1>;
45+
clocks = <&xtal>;
46+
};

Documentation/devicetree/bindings/clock/prima2-clock.txt

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

0 commit comments

Comments
 (0)