Skip to content

Commit 514798d

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 round has a diffstat dominated by Qualcomm clk drivers. Honestly though that's just a bunch of data so the diffstat reflects that. Looking beyond that there's just a bunch of updates all around in various clk drivers. Renesas and NXP (for i.MX) are two SoC vendors that have a lot of patches in here. Overall the driver changes look to be mostly enabling more clks and non-critical fixes that we could hold until the next merge window. I'm especially excited about the series from Arnd that graduates clkdev to be the only implementation of clk_get() and clk_put(). That's a good step in the right direction to migreate eveerything over to the common clk framework. Now we don't have to worry about clkdev specific details, they're just part of the clk API now. Core: - clkdev is now the only option, i.e. clk_get()/clk_put() is implemented in only one place in the kernel instead of in drivers/clk/clkdev.c and in architectures that want their own implementation New Drivers: - Texas Instruments' LMK04832 Ultra Low-Noise JESD204B Compliant Clock Jitter Cleaner With Dual Loop PLLs - Qualcomm MDM9607 GCC - Qualcomm SC8180X display clks - Qualcomm SM6125 GCC - Qualcomm SM8250 CAMCC (camera) - Renesas RZ/G2L SoC - Hisilicon hi3559A SoC Updates: - Stop using clock-output-names in ST clk drivers (yay!) - Support secure mode of STM32MP1 SoCs - Improve clock support for Actions S500 SoC - duty cycle setting support on qcom clks - Add TI am33xx spread spectrum clock support - Use determine_rate() for the Amlogic pll ops instead of round_rate() - Restrict Amlogic gp0/1 and audio plls range on g12a/sm1 - Improve Amlogic axg-audio controller error on deferral - Add NNA clocks on Amlogic g12a - Reduce memory footprint of Rockchip PLL rate tables - A fix for the newly added Rockchip rk3568 clk driver - Exported clock for the newly added Rockchip video decoder - Remove audio ipg clock from i.MX8MP - Remove deprecated legacy clock binding for i.MX SCU clock driver - Use common clk-imx8qxp for both i.MX8QXP and i.MX8QM - Add multiple clocks to clk-imx8qxp driver (enet, hdmi, lcdif, audio, parallel interface) - Add dedicated clock ops for i.MX paralel interface - Different fixes for clocks controlled by ATF on i.MX SoCs - Add A53/A72 frequency scaling support i.MX clk-scu driver - Add special case for DCSS clock on suspend for i.MX clk-scu driver - Add parent save/restore on suspend/resume to i.MX clk-scu driver - Skip runtime PM enablement for CPU clocks in i.MX clk-scu driver - Remove the sys1_pll/sys2_pll clock gates for i.MX8MQ and their bindings - Tegra clk driver no longer deasserts resets on clk_enable as it gets in the way of certain power-up sequences - Fix compile testing for Tegra clk driver - One patch to fix a divider on the Allwinner v3s Audio PLL - Add support for CPU core clock boost modes on Renesas R-Car Gen3 - Add ISPCS (Image Signal Processor) clocks on Renesas R-Car V3U - Switch SH/R-Mobile and R-Car "DIV6" clocks to .determine_rate() and improve support for multiple parents - Switch Renesas RZ/N1 divider clocks to .determine_rate() - Add ZA2 (Audio Clock Generator) clock on Renesas R-Car D3 - Convert ar7 to common clk framework - Convert ralink to common clk framework" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (161 commits) clk: zynqmp: Handle divider specific read only flag clk: zynqmp: Use firmware specific mux clock flags clk: zynqmp: Use firmware specific divider clock flags clk: zynqmp: Use firmware specific common clock flags clk: lmk04832: Use of match table clk: lmk04832: Depend on SPI clk: stm32mp1: new compatible for secure RCC support dt-bindings: clock: stm32mp1 new compatible for secure rcc dt-bindings: reset: add MCU HOLD BOOT ID for SCMI reset domains on stm32mp15 dt-bindings: reset: add IDs for SCMI reset domains on stm32mp15 dt-bindings: clock: add IDs for SCMI clocks on stm32mp15 reset: stm32mp1: remove stm32mp1 reset clk: hisilicon: Add clock driver for hi3559A SoC dt-bindings: Document the hi3559a clock bindings clk: si5341: Add sysfs properties to allow checking/resetting device faults clk: si5341: Add silabs,iovdd-33 property clk: si5341: Add silabs,xaxb-ext-clk property clk: si5341: Allow different output VDD_SEL values clk: si5341: Update initialization magic clk: si5341: Check for input clock presence and PLL lock on startup ...
2 parents e058a84 + d2b2101 commit 514798d

File tree

163 files changed

+18191
-2068
lines changed

Some content is hidden

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

163 files changed

+18191
-2068
lines changed

Documentation/devicetree/bindings/arm/freescale/fsl,scu.txt

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,13 +86,11 @@ This binding uses the common clock binding[1].
8686

8787
Required properties:
8888
- compatible: Should be one of:
89-
"fsl,imx8qm-clock"
90-
"fsl,imx8qxp-clock"
89+
"fsl,imx8qm-clk"
90+
"fsl,imx8qxp-clk"
9191
followed by "fsl,scu-clk"
92-
- #clock-cells: Should be either
93-
2: Contains the Resource and Clock ID value.
94-
or
95-
1: Contains the Clock ID value. (DEPRECATED)
92+
- #clock-cells: Should be 2.
93+
Contains the Resource and Clock ID value.
9694
- clocks: List of clock specifiers, must contain an entry for
9795
each required entry in clock-names
9896
- clock-names: Should include entries "xtal_32KHz", "xtal_24MHz"

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

Lines changed: 0 additions & 19 deletions
This file was deleted.
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/gpio-mux-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Simple GPIO clock multiplexer
8+
9+
maintainers:
10+
- Sergej Sawazki <[email protected]>
11+
12+
properties:
13+
compatible:
14+
const: gpio-mux-clock
15+
16+
clocks:
17+
items:
18+
- description: First parent clock
19+
- description: Second parent clock
20+
21+
'#clock-cells':
22+
const: 0
23+
24+
select-gpios:
25+
description: GPIO reference for selecting the parent clock.
26+
maxItems: 1
27+
28+
required:
29+
- compatible
30+
- clocks
31+
- '#clock-cells'
32+
- select-gpios
33+
34+
additionalProperties: false
35+
36+
examples:
37+
- |
38+
#include <dt-bindings/gpio/gpio.h>
39+
40+
clock {
41+
compatible = "gpio-mux-clock";
42+
clocks = <&parentclk1>, <&parentclk2>;
43+
#clock-cells = <0>;
44+
select-gpios = <&gpio 1 GPIO_ACTIVE_HIGH>;
45+
};
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-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/hisilicon,hi3559av100-clock.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Hisilicon SOC Clock for HI3559AV100
8+
9+
maintainers:
10+
- Dongjiu Geng <[email protected]>
11+
12+
description: |
13+
Hisilicon SOC clock control module which supports the clocks, resets and
14+
power domains on HI3559AV100.
15+
16+
See also:
17+
dt-bindings/clock/hi3559av100-clock.h
18+
19+
properties:
20+
compatible:
21+
enum:
22+
- hisilicon,hi3559av100-clock
23+
- hisilicon,hi3559av100-shub-clock
24+
25+
reg:
26+
minItems: 1
27+
maxItems: 2
28+
29+
'#clock-cells':
30+
const: 1
31+
32+
'#reset-cells':
33+
const: 2
34+
description: |
35+
First cell is reset request register offset.
36+
Second cell is bit offset in reset request register.
37+
38+
required:
39+
- compatible
40+
- reg
41+
- '#clock-cells'
42+
- '#reset-cells'
43+
44+
additionalProperties: false
45+
46+
examples:
47+
- |
48+
soc {
49+
#address-cells = <2>;
50+
#size-cells = <2>;
51+
52+
clock-controller@12010000 {
53+
compatible = "hisilicon,hi3559av100-clock";
54+
#clock-cells = <1>;
55+
#reset-cells = <2>;
56+
reg = <0x0 0x12010000 0x0 0x10000>;
57+
};
58+
};
59+
...

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ select:
2222
enum:
2323
- ingenic,jz4740-cgu
2424
- ingenic,jz4725b-cgu
25+
- ingenic,jz4760-cgu
26+
- ingenic,jz4760b-cgu
2527
- ingenic,jz4770-cgu
2628
- ingenic,jz4780-cgu
2729
- ingenic,x1000-cgu
@@ -49,6 +51,8 @@ properties:
4951
- enum:
5052
- ingenic,jz4740-cgu
5153
- ingenic,jz4725b-cgu
54+
- ingenic,jz4760-cgu
55+
- ingenic,jz4760b-cgu
5256
- ingenic,jz4770-cgu
5357
- ingenic,jz4780-cgu
5458
- ingenic,x1000-cgu
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
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,camcc-sm8250.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Camera Clock & Reset Controller Binding for SM8250
8+
9+
maintainers:
10+
- Jonathan Marek <[email protected]>
11+
12+
description: |
13+
Qualcomm camera clock control module which supports the clocks, resets and
14+
power domains on SM8250.
15+
16+
See also dt-bindings/clock/qcom,camcc-sm8250.h
17+
18+
properties:
19+
compatible:
20+
const: qcom,sm8250-camcc
21+
22+
clocks:
23+
items:
24+
- description: Board XO source
25+
- description: Sleep clock source
26+
27+
clock-names:
28+
items:
29+
- const: bi_tcxo
30+
- const: sleep_clk
31+
32+
'#clock-cells':
33+
const: 1
34+
35+
'#reset-cells':
36+
const: 1
37+
38+
'#power-domain-cells':
39+
const: 1
40+
41+
reg:
42+
maxItems: 1
43+
44+
required:
45+
- compatible
46+
- reg
47+
- clocks
48+
- clock-names
49+
- '#clock-cells'
50+
- '#reset-cells'
51+
- '#power-domain-cells'
52+
53+
additionalProperties: false
54+
55+
examples:
56+
- |
57+
#include <dt-bindings/clock/qcom,rpmh.h>
58+
clock-controller@ad00000 {
59+
compatible = "qcom,sm8250-camcc";
60+
reg = <0x0ad00000 0x10000>;
61+
clocks = <&rpmhcc RPMH_CXO_CLK>,
62+
<&sleep_clk>;
63+
clock-names = "bi_tcxo", "sleep_clk";
64+
#clock-cells = <1>;
65+
#reset-cells = <1>;
66+
#power-domain-cells = <1>;
67+
};
68+
...

Documentation/devicetree/bindings/clock/qcom,dispcc-sm8x50.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ description: |
2020
properties:
2121
compatible:
2222
enum:
23+
- qcom,sc8180x-dispcc
2324
- qcom,sm8150-dispcc
2425
- qcom,sm8250-dispcc
2526

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
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-sm6125.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Qualcomm Global Clock & Reset Controller Binding for SM6125
8+
9+
maintainers:
10+
- Konrad Dybcio <[email protected]>
11+
12+
description: |
13+
Qualcomm global clock control module which supports the clocks, resets and
14+
power domains on SM6125.
15+
16+
See also:
17+
- dt-bindings/clock/qcom,gcc-sm6125.h
18+
19+
properties:
20+
compatible:
21+
const: qcom,gcc-sm6125
22+
23+
clocks:
24+
items:
25+
- description: Board XO source
26+
- description: Sleep clock source
27+
28+
clock-names:
29+
items:
30+
- const: bi_tcxo
31+
- const: sleep_clk
32+
33+
'#clock-cells':
34+
const: 1
35+
36+
'#reset-cells':
37+
const: 1
38+
39+
'#power-domain-cells':
40+
const: 1
41+
42+
reg:
43+
maxItems: 1
44+
45+
protected-clocks:
46+
description:
47+
Protected clock specifier list as per common clock binding.
48+
49+
required:
50+
- compatible
51+
- clocks
52+
- clock-names
53+
- reg
54+
- '#clock-cells'
55+
- '#reset-cells'
56+
- '#power-domain-cells'
57+
58+
additionalProperties: false
59+
60+
examples:
61+
- |
62+
#include <dt-bindings/clock/qcom,rpmcc.h>
63+
clock-controller@1400000 {
64+
compatible = "qcom,gcc-sm6125";
65+
reg = <0x01400000 0x1f0000>;
66+
#clock-cells = <1>;
67+
#reset-cells = <1>;
68+
#power-domain-cells = <1>;
69+
clock-names = "bi_tcxo", "sleep_clk";
70+
clocks = <&rpmcc RPM_SMD_XO_CLK_SRC>, <&sleep_clk>;
71+
};
72+
...

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,10 @@ description: |
2626
- dt-bindings/reset/qcom,gcc-msm8939.h
2727
- dt-bindings/clock/qcom,gcc-msm8660.h
2828
- dt-bindings/reset/qcom,gcc-msm8660.h
29-
- dt-bindings/clock/qcom,gcc-msm8974.h
30-
- dt-bindings/reset/qcom,gcc-msm8974.h
29+
- dt-bindings/clock/qcom,gcc-msm8974.h (qcom,gcc-msm8226 and qcom,gcc-msm8974)
30+
- dt-bindings/reset/qcom,gcc-msm8974.h (qcom,gcc-msm8226 and qcom,gcc-msm8974)
3131
- dt-bindings/clock/qcom,gcc-msm8994.h
32+
- dt-bindings/clock/qcom,gcc-mdm9607.h
3233
- dt-bindings/clock/qcom,gcc-mdm9615.h
3334
- dt-bindings/reset/qcom,gcc-mdm9615.h
3435
- dt-bindings/clock/qcom,gcc-sdm660.h (qcom,gcc-sdm630 and qcom,gcc-sdm660)
@@ -40,6 +41,8 @@ properties:
4041
- qcom,gcc-ipq4019
4142
- qcom,gcc-ipq6018
4243
- qcom,gcc-ipq8064
44+
- qcom,gcc-mdm9607
45+
- qcom,gcc-msm8226
4346
- qcom,gcc-msm8660
4447
- qcom,gcc-msm8916
4548
- qcom,gcc-msm8939

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Required properties :
1212

1313
"qcom,rpmcc-msm8660", "qcom,rpmcc"
1414
"qcom,rpmcc-apq8060", "qcom,rpmcc"
15+
"qcom,rpmcc-msm8226", "qcom,rpmcc"
1516
"qcom,rpmcc-msm8916", "qcom,rpmcc"
1617
"qcom,rpmcc-msm8936", "qcom,rpmcc"
1718
"qcom,rpmcc-msm8974", "qcom,rpmcc"

0 commit comments

Comments
 (0)