Skip to content

Commit ddebe83

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 merge window we have one small clk provider API in the core framework and then a bunch of driver updates and a handful of new drivers. In terms of diffstat the Qualcomm and Amlogic drivers are high up there because of all the clk data introcued by new drivers. The Nvidia Tegra driver had a lot of work done this cycle too to support suspend/resume and memory controllers. And the OMAP clk driver got proper clk and reset handling in place. Rounding out the patches are various updates to remove unused data, mark things static, correct incorrect data in drivers, etc. All the little things that improve drivers and maintain code health. I will point out that there's a patch in here for the GPIO clk driver, that almost nobody uses, which changes behavior and causes clk_set_rate() to try to change the GPIO gate clk's parent. Other than that things are fairly well SoC specific here. Core: - Add a clk provider API to get current parent index - Plug a memory leak in clk_unregister() path New Drivers: - CGU in Ingenix X1000 - Bitmain BM1880 clks - Qualcomm MSM8998 GPU clk controllers - Qualcomm SC7180 GCC and RPMH clk controllers - Qualcomm QCS404 Q6SSTOP clk controllers - Add support for the Renesas R-Car M3-W+ (r8a77961) SoC - Add support for the Renesas RZ/G2N (r8a774b1) SoC - Add Tegra20/30 External Memory Clock (EMC) support Updates: - Make gpio gate clks propagate rate setting up to parent - Prepare Armada 3700 for suspend to RAM by moving PCIe suspend/resume priority - Drop unused variables, enums, etc. in various clk drivers - Convert various drivers to use devm_platform_ioremap_resource() - Use struct_size() some more in various clk drivers - Improve Rockchip px30 clk tree - Add suspend/resume support to Tegra210 clk driver - Reimplement SOR clks on earlier Tegra SoCs, helping HDMI and DP - Allwinner DT exports and H6 clk tree fixes - Proper clk and reset handling for OMAP SoCs - Revamped TI divider clk to clamp max divider - Make 1443X/1416X PLL clock structure common for reusing among i.MX8 SoCs - Drop IMX7ULP_CLK_MIPI_PLL clock, it shouldn't be used - Add VIDEO2_PLL clock for imx8mq - Add missing gate clock for pll1/2 fixed dividers on i.MX8 SoCs - Add sm1 support in the Amlogic audio clock controller - Switch some clocks on R-Car Gen2/3 to .determine_rate() - Remove Renesas R-Car Gen2 legacy DT clock support - Improve arithmetic divisions on Renesas R-Car Gen2 and Gen3 - Improve Renesas R-Car Gen3 SD clock handling - Add rate table for Samsung exynos542x GPU and VPLL clks - Fix potential CPU performance degradation after system suspend/resume cycle on exynos542x SoCs" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (160 commits) clk: aspeed: Add RMII RCLK gates for both AST2500 MACs MAINTAINERS: Add entry for BM1880 SoC clock driver clk: Add common clock driver for BM1880 SoC dt-bindings: clock: Add devicetree binding for BM1880 SoC clk: Add clk_hw_unregister_composite helper function definition clk: Zero init clk_init_data in helpers clk: ingenic: Allow drivers to be built with COMPILE_TEST MAINTAINERS: Update section for Ux500 clock drivers clk: mark clk_disable_unused() as __init clk: Fix memory leak in clk_unregister() clk: Ingenic: Add CGU driver for X1000. dt-bindings: clock: Add X1000 bindings. clk: tegra: Use match_string() helper to simplify the code clk: pxa: fix one of the pxa RTC clocks clk: sprd: Use IS_ERR() to validate the return value of syscon_regmap_lookup_by_phandle() clk: armada-xp: remove unused code clk: tegra: Fix build error without CONFIG_PM_SLEEP clk: tegra: Add missing stubs for the case of !CONFIG_PM_SLEEP clk: tegra: Optimize PLLX restore on Tegra20/30 clk: tegra: Add suspend and resume support on Tegra210 ...
2 parents ceb3074 + ec16ffe commit ddebe83

File tree

156 files changed

+8931
-2444
lines changed

Some content is hidden

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

156 files changed

+8931
-2444
lines changed

Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ devices.
77
Required Properties:
88

99
- compatible : should be "amlogic,axg-audio-clkc" for the A113X and A113D,
10-
"amlogic,g12a-audio-clkc" for G12A.
10+
"amlogic,g12a-audio-clkc" for G12A,
11+
"amlogic,sm1-audio-clkc" for S905X3.
1112
- reg : physical base address of the clock controller and length of
1213
memory mapped region.
1314
- clocks : a list of phandle + clock-specifier pairs for the clocks listed

Documentation/devicetree/bindings/clock/armada3700-periph-clock.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bridge.
99
The peripheral clock consumer should specify the desired clock by
1010
having the clock ID in its "clocks" phandle cell.
1111

12-
The following is a list of provided IDs for Armada 370 North bridge clocks:
12+
The following is a list of provided IDs for Armada 3700 North bridge clocks:
1313
ID Clock name Description
1414
-----------------------------------
1515
0 mmc MMC controller
@@ -30,7 +30,7 @@ ID Clock name Description
3030
15 eip97 EIP 97
3131
16 cpu CPU
3232

33-
The following is a list of provided IDs for Armada 370 South bridge clocks:
33+
The following is a list of provided IDs for Armada 3700 South bridge clocks:
3434
ID Clock name Description
3535
-----------------------------------
3636
0 gbe-50 50 MHz parent clock for Gigabit Ethernet
@@ -46,6 +46,7 @@ ID Clock name Description
4646
10 sdio SDIO
4747
11 usb32-sub2-sys USB 2 clock
4848
12 usb32-ss-sys USB 3 clock
49+
13 pcie PCIe controller
4950

5051
Required properties:
5152

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-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/bindings/clock/bitmain,bm1880-clk.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Bitmain BM1880 Clock Controller
8+
9+
maintainers:
10+
- Manivannan Sadhasivam <[email protected]>
11+
12+
description: |
13+
The Bitmain BM1880 clock controller generates and supplies clock to
14+
various peripherals within the SoC.
15+
16+
This binding uses common clock bindings
17+
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
18+
19+
properties:
20+
compatible:
21+
const: bitmain,bm1880-clk
22+
23+
reg:
24+
items:
25+
- description: pll registers
26+
- description: system registers
27+
28+
reg-names:
29+
items:
30+
- const: pll
31+
- const: sys
32+
33+
clocks:
34+
maxItems: 1
35+
36+
clock-names:
37+
const: osc
38+
39+
'#clock-cells':
40+
const: 1
41+
42+
required:
43+
- compatible
44+
- reg
45+
- reg-names
46+
- clocks
47+
- clock-names
48+
- '#clock-cells'
49+
50+
additionalProperties: false
51+
52+
examples:
53+
# Clock controller node:
54+
- |
55+
clk: clock-controller@e8 {
56+
compatible = "bitmain,bm1880-clk";
57+
reg = <0xe8 0x0c>, <0x800 0xb0>;
58+
reg-names = "pll", "sys";
59+
clocks = <&osc>;
60+
clock-names = "osc";
61+
#clock-cells = <1>;
62+
};
63+
64+
# Example UART controller node that consumes clock generated by the clock controller:
65+
- |
66+
uart0: serial@58018000 {
67+
compatible = "snps,dw-apb-uart";
68+
reg = <0x0 0x58018000 0x0 0x2000>;
69+
clocks = <&clk 45>, <&clk 46>;
70+
clock-names = "baudclk", "apb_pclk";
71+
interrupts = <0 9 4>;
72+
reg-shift = <2>;
73+
reg-io-width = <4>;
74+
};
75+
76+
...

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ pcc2: pcc2@403f0000 {
8282
<&scg1 IMX7ULP_CLK_APLL_PFD0>,
8383
<&scg1 IMX7ULP_CLK_UPLL>,
8484
<&scg1 IMX7ULP_CLK_SOSC_BUS_CLK>,
85-
<&scg1 IMX7ULP_CLK_MIPI_PLL>,
8685
<&scg1 IMX7ULP_CLK_FIRC_BUS_CLK>,
8786
<&scg1 IMX7ULP_CLK_ROSC>,
8887
<&scg1 IMX7ULP_CLK_SPLL_BUS_CLK>;

Documentation/devicetree/bindings/clock/ingenic,cgu.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ Required properties:
1111
* ingenic,jz4725b-cgu
1212
* ingenic,jz4770-cgu
1313
* ingenic,jz4780-cgu
14+
* ingenic,x1000-cgu
1415
- reg : The address & length of the CGU registers.
1516
- clocks : List of phandle & clock specifiers for clocks external to the CGU.
1617
Two such external clocks should be specified - first the external crystal

Documentation/devicetree/bindings/clock/qcom,gcc.txt

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

0 commit comments

Comments
 (0)