Skip to content

Commit 4d5c4ae

Browse files
committed
Merge branches 'clk-socfpga', 'clk-mstar', 'clk-qcom' and 'clk-warnings' into clk-next
- 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 - Video clk fixups on Qualcomm SM8250 - GPU clks for Qualcomm SDM660/SDM630 - Improvements for multimedia clks on Qualcomm MSM8998 - Fix many warnings with W=1 enabled builds under drivers/clk/ * clk-socfpga: clk: socfpga: agilex: add clock driver for eASIC N5X platform dt-bindings: documentation: add clock bindings information for eASIC N5X * clk-mstar: clk: mstar: msc313-mpll: Fix format specifier clk: mstar: Allow MStar clk drivers to be compile tested clk: mstar: MStar/SigmaStar MPLL driver clk: fixed: add devm helper for clk_hw_register_fixed_factor() dt-bindings: clk: mstar msc313 mpll binding description dt-bindings: clk: mstar msc313 mpll binding header * clk-qcom: (42 commits) 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: qcom: mmcc-msm8998: Set bimc_smmu_gdsc always on clk: qcom: mmcc-msm8998: Add hardware clockgating registers to some clks clk: qcom: gcc-msm8998: Fix Alpha PLL type for all GPLLs clk: qcom: gcc-msm8998: Mark gpu_cfg_ahb_clk as critical ... * clk-warnings: (27 commits) clk: zynq: clkc: Remove various instances of an unused variable 'clk' clk: versatile: clk-icst: Fix worthy struct documentation block clk: ti: gate: Fix possible doc-rot in 'omap36xx_gate_clk_enable_with_hsdiv_restore' clk: ti: dpll: Fix misnaming of '_register_dpll()'s 'user' parameter clk: ti: clockdomain: Fix description for 'omap2_init_clk_clkdm's hw param clk: st: clkgen-fsyn: Fix worthy struct documentation demote partially filled one clk: st: clkgen-pll: Demote unpopulated kernel-doc header clk: mvebu: ap-cpu-clk: Demote non-conformant kernel-doc header clk: socfpga: clk-pll-a10: Remove set but unused variable 'rc' clk: socfpga: clk-pll: Remove unused variable 'rc' clk: sifive: fu540-prci: Declare static const variable 'prci_clk_fu540' where it's used clk: bcm: clk-iproc-pll: Demote kernel-doc abuse clk: zynqmp: divider: Add missing description for 'max_div' clk: spear: Move prototype to accessible header clk: qcom: clk-rpm: Remove a bunch of superfluous code clk: clk-xgene: Add description for 'mask' and fix formatting for 'flags' clk: qcom: mmcc-msm8974: Remove unused static const tables 'mmcc_xo_mmpll0_1_2_gpll0{map}' clk: clk-npcm7xx: Remove unused static const tables 'npcm7xx_gates' and 'npcm7xx_divs_fx' clk: clk-fixed-mmio: Demote obvious kernel-doc abuse clk: qcom: gcc-ipq4019: Remove unused variable 'ret' ...
5 parents 11f8310 + a0f9819 + d90afa6 + a3cc092 + bf2244b commit 4d5c4ae

Some content is hidden

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

85 files changed

+18208
-451
lines changed
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+
};
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/qcom,a7pll.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm A7 PLL Binding
8+
9+
maintainers:
10+
- Manivannan Sadhasivam <[email protected]>
11+
12+
description:
13+
The A7 PLL on the Qualcomm platforms like SDX55 is used to provide high
14+
frequency clock to the CPU.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- qcom,sdx55-a7pll
20+
21+
reg:
22+
maxItems: 1
23+
24+
'#clock-cells':
25+
const: 0
26+
27+
clocks:
28+
items:
29+
- description: board XO clock
30+
31+
clock-names:
32+
items:
33+
- const: bi_tcxo
34+
35+
required:
36+
- compatible
37+
- reg
38+
- '#clock-cells'
39+
40+
additionalProperties: false
41+
42+
examples:
43+
- |
44+
#include <dt-bindings/clock/qcom,rpmh.h>
45+
a7pll: clock@17808000 {
46+
compatible = "qcom,sdx55-a7pll";
47+
reg = <0x17808000 0x1000>;
48+
clocks = <&rpmhcc RPMH_CXO_CLK>;
49+
clock-names = "bi_tcxo";
50+
#clock-cells = <0>;
51+
};
Lines changed: 92 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,92 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,gcc-sc7280.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller Binding for SC7280
8+
9+
maintainers:
10+
- Taniya Das <[email protected]>
11+
12+
description: |
13+
Qualcomm global clock control module which supports the clocks, resets and
14+
power domains on SC7280.
15+
16+
See also:
17+
- dt-bindings/clock/qcom,gcc-sc7280.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,gcc-sc7280
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: Board active XO source
27+
- description: Sleep clock source
28+
- description: PCIE-0 pipe clock source
29+
- description: PCIE-1 pipe clock source
30+
- description: USF phy rx symbol 0 clock source
31+
- description: USF phy rx symbol 1 clock source
32+
- description: USF phy tx symbol 0 clock source
33+
- description: USB30 phy wrapper pipe clock source
34+
35+
clock-names:
36+
items:
37+
- const: bi_tcxo
38+
- const: bi_tcxo_ao
39+
- const: sleep_clk
40+
- const: pcie_0_pipe_clk
41+
- const: pcie_1_pipe_clk
42+
- const: ufs_phy_rx_symbol_0_clk
43+
- const: ufs_phy_rx_symbol_1_clk
44+
- const: ufs_phy_tx_symbol_0_clk
45+
- const: usb3_phy_wrapper_gcc_usb30_pipe_clk
46+
47+
'#clock-cells':
48+
const: 1
49+
50+
'#reset-cells':
51+
const: 1
52+
53+
'#power-domain-cells':
54+
const: 1
55+
56+
reg:
57+
maxItems: 1
58+
59+
required:
60+
- compatible
61+
- clocks
62+
- clock-names
63+
- reg
64+
- '#clock-cells'
65+
- '#reset-cells'
66+
- '#power-domain-cells'
67+
68+
additionalProperties: false
69+
70+
examples:
71+
- |
72+
#include <dt-bindings/clock/qcom,rpmh.h>
73+
clock-controller@100000 {
74+
compatible = "qcom,gcc-sc7280";
75+
reg = <0x00100000 0x1f0000>;
76+
clocks = <&rpmhcc RPMH_CXO_CLK>,
77+
<&rpmhcc RPMH_CXO_CLK_A>,
78+
<&sleep_clk>,
79+
<&pcie_0_pipe_clk>, <&pcie_1_pipe_clk>,
80+
<&ufs_phy_rx_symbol_0_clk>, <&ufs_phy_rx_symbol_1_clk>,
81+
<&ufs_phy_tx_symbol_0_clk>,
82+
<&usb3_phy_wrapper_gcc_usb30_pipe_clk>;
83+
84+
clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk", "pcie_0_pipe_clk",
85+
"pcie_1_pipe_clk", "ufs_phy_rx_symbol_0_clk",
86+
"ufs_phy_rx_symbol_1_clk", "ufs_phy_tx_symbol_0_clk",
87+
"usb3_phy_wrapper_gcc_usb30_pipe_clk";
88+
#clock-cells = <1>;
89+
#reset-cells = <1>;
90+
#power-domain-cells = <1>;
91+
};
92+
...
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/clock/qcom,gcc-sc8180x.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller Binding for SC8180x
8+
9+
maintainers:
10+
- Bjorn Andersson <[email protected]>
11+
12+
description: |
13+
Qualcomm global clock control module which supports the clocks, resets and
14+
power domains on SC8180x.
15+
16+
See also:
17+
- dt-bindings/clock/qcom,gcc-sc8180x.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,gcc-sc8180x
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: Board active XO source
27+
- description: Sleep clock source
28+
29+
clock-names:
30+
items:
31+
- const: bi_tcxo
32+
- const: bi_tcxo_ao
33+
- const: sleep_clk
34+
35+
'#clock-cells':
36+
const: 1
37+
38+
'#reset-cells':
39+
const: 1
40+
41+
'#power-domain-cells':
42+
const: 1
43+
44+
reg:
45+
maxItems: 1
46+
47+
protected-clocks:
48+
description:
49+
Protected clock specifier list as per common clock binding.
50+
51+
required:
52+
- compatible
53+
- clocks
54+
- clock-names
55+
- reg
56+
- '#clock-cells'
57+
- '#reset-cells'
58+
- '#power-domain-cells'
59+
60+
additionalProperties: false
61+
62+
examples:
63+
- |
64+
#include <dt-bindings/clock/qcom,rpmh.h>
65+
clock-controller@100000 {
66+
compatible = "qcom,gcc-sc8180x";
67+
reg = <0x00100000 0x1f0000>;
68+
clocks = <&rpmhcc RPMH_CXO_CLK>,
69+
<&rpmhcc RPMH_CXO_CLK_A>,
70+
<&sleep_clk>;
71+
clock-names = "bi_tcxo", "bi_tcxo_ao", "sleep_clk";
72+
#clock-cells = <1>;
73+
#reset-cells = <1>;
74+
#power-domain-cells = <1>;
75+
};
76+
...

0 commit comments

Comments
 (0)