Skip to content

Commit 519f64b

Browse files
torvaldstorvalds
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 time it looks like a quieter release cycle in the clk tree. I guess that's because of summer time holidays/vacations. The biggest change in the diffstat is in the Qualcomm clk driver, where they got support for CPUs and handful of SoCs. After that, the at91 driver got a major rewrite for newer DT bindings that should make things easier going forward and the TI code moved to a clockdomain based design. The long tail is mostly small driver updates for newer clks and some simpler SoC clock drivers such as the Hisilicon and imx support. In the core framework, we only have two small changes this time. One is a new clk API to get all clks for a device with the bulk clk APIs. This allows drivers that don't care about doing anything besides turning on all the clks to just clk_get() them all and turn them on. The other change is the beginning of a way to support save and restore of clk settings in the clk framework. TI is the only user right now, but we will want to expand upon this design in the future to support more save and restore of clk registers. At least this gets us started and works well enough for one SoC, but there's more work in the future. Core: - clk_bulk_get_all() API and friends to get all the clks for a device - Basic clk state save/restore hooks New Drivers: - Renesas RZ/A2 (R7S9210) SoC, including early clocks - Rensas RZ/G1N (R8A7744) and RZ/G2E (R8A774C0) SoCs - Rensas RZ/G2M (r8a774a1) SoC - Qualcomm Krait CPU clk support - Qualcomm QCS404 GCC support - Qualcomm SDM660 GCC support - Qualcomm SDM845 camera clock controller - Ingenic jz4725b CGU - Hisilicon 3670 SoC support - TI SCI clks on K3 SoCs - iMX6 MMDC clks - Reset Controller (RMU) support for Actions Semi Owl S900 and S700 SoCs Updates: - Rework at91 PMC clock driver for new DT bindings - Nvidia Tegra clk driver MBIST workaround fix - S2RAM support for Marvell mvebu periph clks - Use updated printk format for OF node names - Fix TI code to only search DT subnodes - Various static analysis finds - Tag various drivers with SPDX license tags - Support dynamic frequency switching (DFS) on qcom SDM845 GCC - Only use s2mps11 dt-binding defines instead of redefining them in the driver - Add some more missing clks to qcom MSM8996 GCC - Quad SPI clks on qcom SDM845 - Add support for CMT timer clocks on R-Car V3H - Add support for SHDI and various timer clocks on R-Car V3M - Improve OSC and RCLK (watchdog) handling on R-Car Gen3 SoCs - Amlogic clk-pll driver improvements and updates - Amlogic axg audio controller system clocks - Register Amlogic meson8b clock controller early - Add support for SATA and Fine Display Processor (FDP) clocks on R-Car M3-N - Consolidation of system suspend related code in Exynos, S5P, S3C SoC clk drivers - Fixes for system suspend support on Exynos542x (Odroid boards) and Exynos5433 SoC - Remove obsoleted Exynos4212 ISP clock definitions - Migrated TI am3/4/5 and dra7 SoCs to clockdomain based design - TI RTC+DDR sleep mode support for clock save/restore - Allwinner A64 display engine support and fixes - Allwinner A83t display engine support and fixes" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (186 commits) clk: qcom: Remove unused arrays in SDM845 GCC clk: fixed-rate: fix of_node_get-put imbalance clk: s2mps11: Add used attribute to s2mps11_dt_match clk: qcom: gcc-sdm660: Add MODULE_LICENSE clk: qcom: Add safe switch hook for krait mux clocks dt-bindings: clock: Document qcom,krait-cc clk: qcom: Add Krait clock controller driver dt-bindings: arm: Document qcom,kpss-gcc clk: qcom: Add KPSS ACC/GCC driver clk: qcom: Add support for Krait clocks clk: qcom: Add IPQ806X's HFPLLs clk: qcom: Add MSM8960/APQ8064's HFPLLs dt-bindings: clock: Document qcom,hfpll clk: qcom: Add HFPLL driver clk: qcom: Add support for High-Frequency PLLs (HFPLLs) ARM: Add Krait L2 register accessor functions clk: imx6q: add mmdc0 ipg clock clk: imx6sl: add mmdc ipg clocks clk: imx6sll: add mmdc1 ipg clock clk: imx6sx: add mmdc1 ipg clock ...
2 parents 0c86e76 + 9a1d6b2 commit 519f64b

File tree

284 files changed

+20482
-4223
lines changed

Some content is hidden

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

284 files changed

+20482
-4223
lines changed

‎Documentation/devicetree/bindings/arm/msm/qcom,kpss-acc.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,29 @@ PROPERTIES
2121
the register region. An optional second element specifies
2222
the base address and size of the alias register region.
2323

24+
- clocks:
25+
Usage: required
26+
Value type: <prop-encoded-array>
27+
Definition: reference to the pll parents.
28+
29+
- clock-names:
30+
Usage: required
31+
Value type: <stringlist>
32+
Definition: must be "pll8_vote", "pxo".
33+
34+
- clock-output-names:
35+
Usage: optional
36+
Value type: <string>
37+
Definition: Name of the output clock. Typically acpuX_aux where X is a
38+
CPU number starting at 0.
39+
2440
Example:
2541

2642
clock-controller@2088000 {
2743
compatible = "qcom,kpss-acc-v2";
2844
reg = <0x02088000 0x1000>,
2945
<0x02008000 0x1000>;
46+
clocks = <&gcc PLL8_VOTE>, <&gcc PXO_SRC>;
47+
clock-names = "pll8_vote", "pxo";
48+
clock-output-names = "acpu0_aux";
3049
};

‎Documentation/devicetree/bindings/arm/msm/qcom,kpss-gcc.txt

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
Krait Processor Sub-system (KPSS) Global Clock Controller (GCC)
2+
3+
PROPERTIES
4+
5+
- compatible:
6+
Usage: required
7+
Value type: <string>
8+
Definition: should be one of the following. The generic compatible
9+
"qcom,kpss-gcc" should also be included.
10+
"qcom,kpss-gcc-ipq8064", "qcom,kpss-gcc"
11+
"qcom,kpss-gcc-apq8064", "qcom,kpss-gcc"
12+
"qcom,kpss-gcc-msm8974", "qcom,kpss-gcc"
13+
"qcom,kpss-gcc-msm8960", "qcom,kpss-gcc"
14+
15+
- reg:
16+
Usage: required
17+
Value type: <prop-encoded-array>
18+
Definition: base address and size of the register region
19+
20+
- clocks:
21+
Usage: required
22+
Value type: <prop-encoded-array>
23+
Definition: reference to the pll parents.
24+
25+
- clock-names:
26+
Usage: required
27+
Value type: <stringlist>
28+
Definition: must be "pll8_vote", "pxo".
29+
30+
- clock-output-names:
31+
Usage: required
32+
Value type: <string>
33+
Definition: Name of the output clock. Typically acpu_l2_aux indicating
34+
an L2 cache auxiliary clock.
35+
36+
Example:
37+
38+
l2cc: clock-controller@2011000 {
39+
compatible = "qcom,kpss-gcc-ipq8064", "qcom,kpss-gcc";
40+
reg = <0x2011000 0x1000>;
41+
clocks = <&gcc PLL8_VOTE>, <&gcc PXO_SRC>;
42+
clock-names = "pll8_vote", "pxo";
43+
clock-output-names = "acpu_l2_aux";
44+
};

‎Documentation/devicetree/bindings/clock/actions,owl-cmu.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ Required Properties:
1313
region.
1414
- clocks: Reference to the parent clocks ("hosc", "losc")
1515
- #clock-cells: should be 1.
16+
- #reset-cells: should be 1.
1617

1718
Each clock is assigned an identifier, and client nodes can use this identifier
1819
to specify the clock which they consume.
@@ -36,6 +37,7 @@ Example: Clock Management Unit node:
3637
reg = <0x0 0xe0160000 0x0 0x1000>;
3738
clocks = <&hosc>, <&losc>;
3839
#clock-cells = <1>;
40+
#reset-cells = <1>;
3941
};
4042

4143
Example: UART controller node that consumes clock generated by the clock

0 commit comments

Comments
 (0)