Skip to content

Commit 30185b6

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: "It looks like a smaller batch of clk updates this time around. In the core framework we just have some minor tweaks and a debugfs feature, so not much to see there. The driver updates are fairly well split between AT91 and Qualcomm clk support. Adding those two drivers together equals about 50% of the diffstat. Otherwise, the big amount of work this time was on supporting Broadcom's Raspberry Pi firmware clks. Highlights: Core: - Document clk_hw_round_rate() so it gets some more use - Remove unused __clk_get_flags() - Add a prepare/enable debugfs feature similar to rate setting New Drivers: - Add support for SAMA7G5 SoC clks - Enable CPU clks on Qualcomm IPQ6018 SoCs - Enable CPU clks on Qualcomm MSM8996 SoCs - GPU clk support for Qualcomm SM8150 and SM8250 SoCs - Audio clks on Qualcomm SC7180 SoCs - Microchip Sparx5 DPLL clk - Add support for the new Renesas RZ/G2H (R8A774E1) SoC Updates: - Make defines for bcm63xx-gate clks to use in DT - Support BCM2711 SoC firmware clks - Add HDMI clks for BCM2711 SoCs - Add RTC related clks on Ingenic SoCs - Support USB PHY clks on Ingenic SoCs - Support gate clks on BCM6318 SoCs - RMU and DMAC/GPIO clock support for Actions Semi S500 SoCs - Use poll_timeout functions in Rockchip clk driver - Support Rockchip rk3288w SoC variant - Mark mac_lbtest critical on Rockchip rk3188 - Add CAAM clock support for i.MX vf610 driver - Add MU root clock support for i.MX imx8mp driver - Amlogic g12: add neural network accelerator clock sources - Amlogic meson8: remove critical flag for main PLL divider - Amlogic meson8: add video decoder clock gates - Convert one more Renesas DT binding to json-schema - Enhance critical clock handling on Renesas platforms to only consider clocks that were enabled at boot time" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (79 commits) clk: qcom: gcc: Make disp gpll0 branch aon for sc7180/sdm845 ipq806x: gcc: add support for child probe clk: qcom: msm8996: Make symbol 'cpu_msm8996_clks' static clk: qcom: ipq8074: Add correct index for PCIe clocks clk: <linux/clk-provider.h>: drop a duplicated word clk: renesas: cpg-mssr: Add r8a774e1 support dt-bindings: clock: renesas,cpg-mssr: Document r8a774e1 clk: Drop duplicate selection in Kconfig clk: qcom: smd: Add support for MSM8992/4 rpm clocks clk: qcom: ipq8074: Add missing clocks for pcie dt-bindings: clock: qcom: ipq8074: Add missing bindings for PCIe Replace HTTP links with HTTPS ones: Common CLK framework clk: qcom: Add CPU clock driver for msm8996 dt-bindings: clk: qcom: Add bindings for CPU clock for msm8996 soc: qcom: Separate kryo l2 accessors from PMU driver clk: meson: meson8b: add the vclk2_en gate clock clk: meson: meson8b: add the vclk_en gate clock clk: qcom: Fix return value check in apss_ipq6018_probe() clk: bcm: dvp: Add missing module informations clk: meson: meson8b: Drop CLK_IS_CRITICAL from fclk_div2 ...
2 parents 0f43283 + 63e9584 commit 30185b6

File tree

90 files changed

+3539
-681
lines changed

Some content is hidden

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

90 files changed

+3539
-681
lines changed

Documentation/devicetree/bindings/arm/bcm/raspberrypi,bcm2835-firmware.txt

Lines changed: 0 additions & 14 deletions
This file was deleted.
Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/arm/bcm/raspberrypi,bcm2835-firmware.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Raspberry Pi VideoCore firmware driver
8+
9+
maintainers:
10+
- Eric Anholt <[email protected]>
11+
- Stefan Wahren <[email protected]>
12+
13+
properties:
14+
compatible:
15+
items:
16+
- const: raspberrypi,bcm2835-firmware
17+
- const: simple-bus
18+
19+
mboxes:
20+
$ref: '/schemas/types.yaml#/definitions/phandle'
21+
description: |
22+
Phandle to the firmware device's Mailbox.
23+
(See: ../mailbox/mailbox.txt for more information)
24+
25+
clocks:
26+
type: object
27+
28+
properties:
29+
compatible:
30+
const: raspberrypi,firmware-clocks
31+
32+
"#clock-cells":
33+
const: 1
34+
description: >
35+
The argument is the ID of the clocks contained by the
36+
firmware messages.
37+
38+
required:
39+
- compatible
40+
- "#clock-cells"
41+
42+
additionalProperties: false
43+
44+
required:
45+
- compatible
46+
- mboxes
47+
48+
examples:
49+
- |
50+
firmware {
51+
compatible = "raspberrypi,bcm2835-firmware", "simple-bus";
52+
mboxes = <&mailbox>;
53+
54+
firmware_clocks: clocks {
55+
compatible = "raspberrypi,firmware-clocks";
56+
#clock-cells = <1>;
57+
};
58+
};
59+
...
Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/brcm,bcm2711-dvp.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Broadcom BCM2711 HDMI DVP Device Tree Bindings
8+
9+
maintainers:
10+
- Maxime Ripard <[email protected]>
11+
12+
properties:
13+
"#clock-cells":
14+
const: 1
15+
16+
"#reset-cells":
17+
const: 1
18+
19+
compatible:
20+
const: brcm,brcm2711-dvp
21+
22+
reg:
23+
maxItems: 1
24+
25+
clocks:
26+
maxItems: 1
27+
28+
required:
29+
- "#clock-cells"
30+
- "#reset-cells"
31+
- compatible
32+
- reg
33+
- clocks
34+
35+
additionalProperties: false
36+
37+
examples:
38+
- |
39+
dvp: clock@7ef00000 {
40+
compatible = "brcm,brcm2711-dvp";
41+
reg = <0x7ef00000 0x10>;
42+
clocks = <&clk_108MHz>;
43+
#clock-cells = <1>;
44+
#reset-cells = <1>;
45+
};
46+
47+
...

Documentation/devicetree/bindings/clock/brcm,bcm63xx-clocks.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ Gated Clock Controller Bindings for MIPS based BCM63XX SoCs
33
Required properties:
44
- compatible: must be one of:
55
"brcm,bcm3368-clocks"
6+
"brcm,bcm6318-clocks"
7+
"brcm,bcm6318-ubus-clocks"
68
"brcm,bcm6328-clocks"
79
"brcm,bcm6358-clocks"
810
"brcm,bcm6362-clocks"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ specifier is an array of zero, one or more cells identifying the clock
99
output on a device. The length of a clock specifier is defined by the
1010
value of a #clock-cells property in the clock provider node.
1111

12-
[1] http://patchwork.ozlabs.org/patch/31551/
12+
[1] https://patchwork.ozlabs.org/patch/31551/
1313

1414
==Clock providers==
1515

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

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,29 @@ Required properties:
3131
- 5p49v5933 and
3232
- 5p49v5935: (optional) property not present or "clkin".
3333

34+
For all output ports, a corresponding, optional child node named OUT1,
35+
OUT2, etc. can represent a each output, and the node can be used to
36+
specify the following:
37+
38+
- itd,mode: can be one of the following:
39+
- VC5_LVPECL
40+
- VC5_CMOS
41+
- VC5_HCSL33
42+
- VC5_LVDS
43+
- VC5_CMOS2
44+
- VC5_CMOSD
45+
- VC5_HCSL25
46+
47+
- idt,voltage-microvolts: can be one of the following
48+
- 1800000
49+
- 2500000
50+
- 3300000
51+
- idt,slew-percent: Percent of normal, can be one of
52+
- 80
53+
- 85
54+
- 90
55+
- 100
56+
3457
==Mapping between clock specifier and physical pins==
3558

3659
When referencing the provided clock in the DT using phandle and
@@ -81,6 +104,16 @@ i2c-master-node {
81104
/* Connect XIN input to 25MHz reference */
82105
clocks = <&ref25m>;
83106
clock-names = "xin";
107+
108+
OUT1 {
109+
itd,mode = <VC5_CMOS>;
110+
idt,voltage-microvolts = <1800000>;
111+
idt,slew-percent = <80>;
112+
};
113+
OUT2 {
114+
...
115+
};
116+
...
84117
};
85118
};
86119

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,24 @@ description:
1515

1616
properties:
1717
compatible:
18-
const: qcom,msm8916-a53pll
18+
enum:
19+
- qcom,ipq6018-a53pll
20+
- qcom,msm8916-a53pll
1921

2022
reg:
2123
maxItems: 1
2224

2325
'#clock-cells':
2426
const: 0
2527

28+
clocks:
29+
items:
30+
- description: board XO clock
31+
32+
clock-names:
33+
items:
34+
- const: xo
35+
2636
required:
2737
- compatible
2838
- reg
@@ -38,3 +48,12 @@ examples:
3848
reg = <0xb016000 0x40>;
3949
#clock-cells = <0>;
4050
};
51+
#Example 2 - A53 PLL found on IPQ6018 devices
52+
- |
53+
a53pll_ipq: clock-controller@b116000 {
54+
compatible = "qcom,ipq6018-a53pll";
55+
reg = <0x0b116000 0x40>;
56+
#clock-cells = <0>;
57+
clocks = <&xo>;
58+
clock-names = "xo";
59+
};
Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: GPL-2.0-only
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/qcom,kryocc.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm clock controller for MSM8996 CPUs
8+
9+
maintainers:
10+
- Loic Poulain <[email protected]>
11+
12+
description: |
13+
Qualcomm CPU clock controller for MSM8996 CPUs, clock 0 is for Power cluster
14+
and clock 1 is for Perf cluster.
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- qcom,msm8996-apcc
20+
21+
reg:
22+
maxItems: 1
23+
24+
'#clock-cells':
25+
const: 1
26+
27+
clocks:
28+
items:
29+
- description: Primary PLL clock for power cluster (little)
30+
- description: Primary PLL clock for perf cluster (big)
31+
- description: Alternate PLL clock for power cluster (little)
32+
- description: Alternate PLL clock for perf cluster (big)
33+
34+
clock-names:
35+
items:
36+
- const: pwrcl_pll
37+
- const: perfcl_pll
38+
- const: pwrcl_alt_pll
39+
- const: perfcl_alt_pll
40+
41+
required:
42+
- compatible
43+
- reg
44+
- '#clock-cells'
45+
46+
additionalProperties: false
47+
48+
examples:
49+
# Example for msm8996
50+
- |
51+
kryocc: clock-controller@6400000 {
52+
compatible = "qcom,msm8996-apcc";
53+
reg = <0x6400000 0x90000>;
54+
#clock-cells = <1>;
55+
};
56+
...

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ Required properties :
1313
"qcom,rpmcc-msm8660", "qcom,rpmcc"
1414
"qcom,rpmcc-apq8060", "qcom,rpmcc"
1515
"qcom,rpmcc-msm8916", "qcom,rpmcc"
16+
"qcom,rpmcc-msm8936", "qcom,rpmcc"
1617
"qcom,rpmcc-msm8974", "qcom,rpmcc"
1718
"qcom,rpmcc-msm8976", "qcom,rpmcc"
1819
"qcom,rpmcc-apq8064", "qcom,rpmcc"
1920
"qcom,rpmcc-ipq806x", "qcom,rpmcc"
21+
"qcom,rpmcc-msm8992",·"qcom,rpmcc"
22+
"qcom,rpmcc-msm8994",·"qcom,rpmcc"
2023
"qcom,rpmcc-msm8996", "qcom,rpmcc"
2124
"qcom,rpmcc-msm8998", "qcom,rpmcc"
2225
"qcom,rpmcc-qcs404", "qcom,rpmcc"
26+
"qcom,rpmcc-sdm660", "qcom,rpmcc"
2327

2428
- #clock-cells : shall contain 1
2529

0 commit comments

Comments
 (0)