-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kerne…
…l/git/clk/linux Pull clk updates from Stephen Boyd: "Mainly driver updates this time around. There's a single patch to the core clk framework that simplifies a runtime PM call. Otherwise the majority of the diff falls to a few SoC drivers: Qualcomm, STM32 and MediaTek. Those SoCs gain some new hardware support and what comes along with that is quite a few lines of data and some clk_ops code. Beyond the new hardware support we have the usual pile of driver updates that add missing clks on already supported SoCs or fix up problems like bad clk tree descriptions. It's nice to see that more drivers are moving to clk_hw based APIs too. New Drivers: - Add STM32MP13 RCC driver (Reset Clock Controller) - MediaTek MT8186 SoC clk support - Airoha EN7523 SoC system clocks - Clock driver for exynosautov9 SoC - Renesas R-Car V4H and RZ/V2M SoCs - Renesas RZ/G2UL SoC - LPASS clk driver for Qualcomm sc7280 SoC - GCC clk driver for Qualcomm SC8280XP SoC Updates: - SDCC uses floor clk ops on Qualcomm MSM8976 - Add modem reset and fix RPM clks on Qualcomm MSM8976 - Add the two missing CLKOUT clocks for U8500/DB8500 SoC - Mark some clks critical on Ingenic X1000 - Convert ux500 to clk_hw - Move MediaTek driver to clk_hw provider APIs - Use i2c driver probe_new to avoid id scans - Convert a number of Rockchip dt bindings to YAML - Mark hclk_vo critical on Rockchip rk3568 - Use pm_runtime_resume_and_get to fix pm_runtime_get_sync() usage - Various cleanups like memory allocation error checks and plugged leaks - Allwinner H6 RTC clock support - Allwinner H616 32 kHz clock support - Add the Universal Flash Storage clock on Renesas R-Car S4-8 - Add I2C, SSIF-2 (sound), USB, CANFD, OSTM (timer), WDT, SPI Multi I/O Bus, RSPI, TSU (thermal), and ADC clocks and resets on Renesas RZ/G2UL - Add display clock support on Renesas RZ/G2L - Add RPC (QSPI/HyperFlash) clocks on Renesas R-Car E3 and D3 - Add 27 MHz phy PLL ref clock on i.MX - Add mcore_booted module parameter to tell kernel M core has already booted for i.MX - Remove snvs clock on i.MX because it was for secure world only - Add dt bindings for i.MX8MN GPT - Add DISP2 pixel clock for i.MX8MP - Add clkout1/2 for i.MX8MP - Fix parent clock of ubs_root_clk for i.MX8MP - Implement better RCG parking on Qualcomm SoCs using the shared RCG clk ops - Kerneldoc fixes - Switch Tegra BPMP to determine_rate clk op - Add a pointer to dt schema for generic clock bindings" * tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (168 commits) Revert "clk: qcom: regmap-mux: add pipe clk implementation" Revert "clk: qcom: gcc-sc7280: use new clk_regmap_mux_safe_ops for PCIe pipe clocks" Revert "clk: qcom: gcc-sm8450: use new clk_regmap_mux_safe_ops for PCIe pipe clocks" clk: bcm: rpi: Use correct order for the parameters of devm_kcalloc() clk: stm32mp13: add safe mux management clk: stm32mp13: add multi mux function clk: stm32mp13: add all STM32MP13 kernel clocks clk: stm32mp13: add all STM32MP13 peripheral clocks clk: stm32mp13: manage secured clocks clk: stm32mp13: add composite clock clk: stm32mp13: add stm32 divider clock clk: stm32mp13: add stm32_gate management clk: stm32mp13: add stm32_mux clock management clk: stm32: Introduce STM32MP13 RCC drivers (Reset Clock Controller) dt-bindings: rcc: stm32: add new compatible for STM32MP13 SoC clk: ti: clkctrl: replace usage of found with dedicated list iterator variable clk: ti: composite: Prefer kcalloc over open coded arithmetic dt-bindings: clock: exynosautov9: correct count of NR_CLK clk: mediatek: mt8173: Switch to clk_hw provider APIs clk: mediatek: Switch to clk_hw provider APIs ...
- Loading branch information
Showing
249 changed files
with
22,752 additions
and
2,050 deletions.
There are no files selected for viewing
56 changes: 56 additions & 0 deletions
56
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8186-clock.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mt8186-clock.yaml#" | ||
$schema: "http://devicetree.org/meta-schemas/core.yaml#" | ||
|
||
title: MediaTek Functional Clock Controller for MT8186 | ||
|
||
maintainers: | ||
- Chun-Jie Chen <chun-jie.chen@mediatek.com> | ||
|
||
description: | | ||
The clock architecture in MediaTek like below | ||
PLLs --> | ||
dividers --> | ||
muxes | ||
--> | ||
clock gate | ||
The devices provide clock gate control in different IP blocks. | ||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- mediatek,mt8186-imp_iic_wrap | ||
- mediatek,mt8186-mfgsys | ||
- mediatek,mt8186-wpesys | ||
- mediatek,mt8186-imgsys1 | ||
- mediatek,mt8186-imgsys2 | ||
- mediatek,mt8186-vdecsys | ||
- mediatek,mt8186-vencsys | ||
- mediatek,mt8186-camsys | ||
- mediatek,mt8186-camsys_rawa | ||
- mediatek,mt8186-camsys_rawb | ||
- mediatek,mt8186-mdpsys | ||
- mediatek,mt8186-ipesys | ||
reg: | ||
maxItems: 1 | ||
|
||
'#clock-cells': | ||
const: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
imp_iic_wrap: clock-controller@11017000 { | ||
compatible = "mediatek,mt8186-imp_iic_wrap"; | ||
reg = <0x11017000 0x1000>; | ||
#clock-cells = <1>; | ||
}; |
54 changes: 54 additions & 0 deletions
54
Documentation/devicetree/bindings/arm/mediatek/mediatek,mt8186-sys-clock.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,54 @@ | ||
# SPDX-License-Identifier: (GPL-2.0 OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: "http://devicetree.org/schemas/arm/mediatek/mediatek,mt8186-sys-clock.yaml#" | ||
$schema: "http://devicetree.org/meta-schemas/core.yaml#" | ||
|
||
title: MediaTek System Clock Controller for MT8186 | ||
|
||
maintainers: | ||
- Chun-Jie Chen <chun-jie.chen@mediatek.com> | ||
|
||
description: | | ||
The clock architecture in MediaTek like below | ||
PLLs --> | ||
dividers --> | ||
muxes | ||
--> | ||
clock gate | ||
The apmixedsys provides most of PLLs which generated from SoC 26m. | ||
The topckgen provides dividers and muxes which provide the clock source to other IP blocks. | ||
The infracfg_ao provides clock gate in peripheral and infrastructure IP blocks. | ||
The mcusys provides mux control to select the clock source in AP MCU. | ||
The device nodes also provide the system control capacity for configuration. | ||
properties: | ||
compatible: | ||
items: | ||
- enum: | ||
- mediatek,mt8186-mcusys | ||
- mediatek,mt8186-topckgen | ||
- mediatek,mt8186-infracfg_ao | ||
- mediatek,mt8186-apmixedsys | ||
- const: syscon | ||
|
||
reg: | ||
maxItems: 1 | ||
|
||
'#clock-cells': | ||
const: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
topckgen: syscon@10000000 { | ||
compatible = "mediatek,mt8186-topckgen", "syscon"; | ||
reg = <0x10000000 0x1000>; | ||
#clock-cells = <1>; | ||
}; |
58 changes: 58 additions & 0 deletions
58
Documentation/devicetree/bindings/clock/airoha,en7523-scu.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,58 @@ | ||
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) | ||
%YAML 1.2 | ||
--- | ||
$id: http://devicetree.org/schemas/clock/airoha,en7523-scu.yaml# | ||
$schema: http://devicetree.org/meta-schemas/core.yaml# | ||
|
||
title: EN7523 Clock Device Tree Bindings | ||
|
||
maintainers: | ||
- Felix Fietkau <nbd@nbd.name> | ||
- John Crispin <nbd@nbd.name> | ||
|
||
description: | | ||
This node defines the System Control Unit of the EN7523 SoC, | ||
a collection of registers configuring many different aspects of the SoC. | ||
The clock driver uses it to read and configure settings of the | ||
PLL controller, which provides clocks for the CPU, the bus and | ||
other SoC internal peripherals. | ||
Each clock is assigned an identifier and client nodes use this identifier | ||
to specify which clock they consume. | ||
All these identifiers can be found in: | ||
[1]: <include/dt-bindings/clock/en7523-clk.h>. | ||
The clocks are provided inside a system controller node. | ||
properties: | ||
compatible: | ||
items: | ||
- const: airoha,en7523-scu | ||
|
||
reg: | ||
maxItems: 2 | ||
|
||
"#clock-cells": | ||
description: | ||
The first cell indicates the clock number, see [1] for available | ||
clocks. | ||
const: 1 | ||
|
||
required: | ||
- compatible | ||
- reg | ||
- '#clock-cells' | ||
|
||
additionalProperties: false | ||
|
||
examples: | ||
- | | ||
#include <dt-bindings/clock/en7523-clk.h> | ||
scu: system-controller@1fa20000 { | ||
compatible = "airoha,en7523-scu"; | ||
reg = <0x1fa20000 0x400>, | ||
<0x1fb00000 0x1000>; | ||
#clock-cells = <1>; | ||
}; |
188 changes: 2 additions & 186 deletions
188
Documentation/devicetree/bindings/clock/clock-bindings.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,186 +1,2 @@ | ||
This binding is a work-in-progress, and are based on some experimental | ||
work by benh[1]. | ||
|
||
Sources of clock signal can be represented by any node in the device | ||
tree. Those nodes are designated as clock providers. Clock consumer | ||
nodes use a phandle and clock specifier pair to connect clock provider | ||
outputs to clock inputs. Similar to the gpio specifiers, a clock | ||
specifier is an array of zero, one or more cells identifying the clock | ||
output on a device. The length of a clock specifier is defined by the | ||
value of a #clock-cells property in the clock provider node. | ||
|
||
[1] https://patchwork.ozlabs.org/patch/31551/ | ||
|
||
==Clock providers== | ||
|
||
Required properties: | ||
#clock-cells: Number of cells in a clock specifier; Typically 0 for nodes | ||
with a single clock output and 1 for nodes with multiple | ||
clock outputs. | ||
|
||
Optional properties: | ||
clock-output-names: Recommended to be a list of strings of clock output signal | ||
names indexed by the first cell in the clock specifier. | ||
However, the meaning of clock-output-names is domain | ||
specific to the clock provider, and is only provided to | ||
encourage using the same meaning for the majority of clock | ||
providers. This format may not work for clock providers | ||
using a complex clock specifier format. In those cases it | ||
is recommended to omit this property and create a binding | ||
specific names property. | ||
|
||
Clock consumer nodes must never directly reference | ||
the provider's clock-output-names property. | ||
|
||
For example: | ||
|
||
oscillator { | ||
#clock-cells = <1>; | ||
clock-output-names = "ckil", "ckih"; | ||
}; | ||
|
||
- this node defines a device with two clock outputs, the first named | ||
"ckil" and the second named "ckih". Consumer nodes always reference | ||
clocks by index. The names should reflect the clock output signal | ||
names for the device. | ||
|
||
clock-indices: If the identifying number for the clocks in the node | ||
is not linear from zero, then this allows the mapping of | ||
identifiers into the clock-output-names array. | ||
|
||
For example, if we have two clocks <&oscillator 1> and <&oscillator 3>: | ||
|
||
oscillator { | ||
compatible = "myclocktype"; | ||
#clock-cells = <1>; | ||
clock-indices = <1>, <3>; | ||
clock-output-names = "clka", "clkb"; | ||
} | ||
|
||
This ensures we do not have any empty strings in clock-output-names | ||
|
||
|
||
==Clock consumers== | ||
|
||
Required properties: | ||
clocks: List of phandle and clock specifier pairs, one pair | ||
for each clock input to the device. Note: if the | ||
clock provider specifies '0' for #clock-cells, then | ||
only the phandle portion of the pair will appear. | ||
|
||
Optional properties: | ||
clock-names: List of clock input name strings sorted in the same | ||
order as the clocks property. Consumers drivers | ||
will use clock-names to match clock input names | ||
with clocks specifiers. | ||
clock-ranges: Empty property indicating that child nodes can inherit named | ||
clocks from this node. Useful for bus nodes to provide a | ||
clock to their children. | ||
|
||
For example: | ||
|
||
device { | ||
clocks = <&osc 1>, <&ref 0>; | ||
clock-names = "baud", "register"; | ||
}; | ||
|
||
|
||
This represents a device with two clock inputs, named "baud" and "register". | ||
The baud clock is connected to output 1 of the &osc device, and the register | ||
clock is connected to output 0 of the &ref. | ||
|
||
==Example== | ||
|
||
/* external oscillator */ | ||
osc: oscillator { | ||
compatible = "fixed-clock"; | ||
#clock-cells = <0>; | ||
clock-frequency = <32678>; | ||
clock-output-names = "osc"; | ||
}; | ||
|
||
/* phase-locked-loop device, generates a higher frequency clock | ||
* from the external oscillator reference */ | ||
pll: pll@4c000 { | ||
compatible = "vendor,some-pll-interface" | ||
#clock-cells = <1>; | ||
clocks = <&osc 0>; | ||
clock-names = "ref"; | ||
reg = <0x4c000 0x1000>; | ||
clock-output-names = "pll", "pll-switched"; | ||
}; | ||
|
||
/* UART, using the low frequency oscillator for the baud clock, | ||
* and the high frequency switched PLL output for register | ||
* clocking */ | ||
uart@a000 { | ||
compatible = "fsl,imx-uart"; | ||
reg = <0xa000 0x1000>; | ||
interrupts = <33>; | ||
clocks = <&osc 0>, <&pll 1>; | ||
clock-names = "baud", "register"; | ||
}; | ||
|
||
This DT fragment defines three devices: an external oscillator to provide a | ||
low-frequency reference clock, a PLL device to generate a higher frequency | ||
clock signal, and a UART. | ||
|
||
* The oscillator is fixed-frequency, and provides one clock output, named "osc". | ||
* The PLL is both a clock provider and a clock consumer. It uses the clock | ||
signal generated by the external oscillator, and provides two output signals | ||
("pll" and "pll-switched"). | ||
* The UART has its baud clock connected the external oscillator and its | ||
register clock connected to the PLL clock (the "pll-switched" signal) | ||
|
||
==Assigned clock parents and rates== | ||
|
||
Some platforms may require initial configuration of default parent clocks | ||
and clock frequencies. Such a configuration can be specified in a device tree | ||
node through assigned-clocks, assigned-clock-parents and assigned-clock-rates | ||
properties. The assigned-clock-parents property should contain a list of parent | ||
clocks in the form of a phandle and clock specifier pair and the | ||
assigned-clock-rates property should contain a list of frequencies in Hz. Both | ||
these properties should correspond to the clocks listed in the assigned-clocks | ||
property. | ||
|
||
To skip setting parent or rate of a clock its corresponding entry should be | ||
set to 0, or can be omitted if it is not followed by any non-zero entry. | ||
|
||
uart@a000 { | ||
compatible = "fsl,imx-uart"; | ||
reg = <0xa000 0x1000>; | ||
... | ||
clocks = <&osc 0>, <&pll 1>; | ||
clock-names = "baud", "register"; | ||
|
||
assigned-clocks = <&clkcon 0>, <&pll 2>; | ||
assigned-clock-parents = <&pll 2>; | ||
assigned-clock-rates = <0>, <460800>; | ||
}; | ||
|
||
In this example the <&pll 2> clock is set as parent of clock <&clkcon 0> and | ||
the <&pll 2> clock is assigned a frequency value of 460800 Hz. | ||
|
||
Configuring a clock's parent and rate through the device node that consumes | ||
the clock can be done only for clocks that have a single user. Specifying | ||
conflicting parent or rate configuration in multiple consumer nodes for | ||
a shared clock is forbidden. | ||
|
||
Configuration of common clocks, which affect multiple consumer devices can | ||
be similarly specified in the clock provider node. | ||
|
||
==Protected clocks== | ||
|
||
Some platforms or firmwares may not fully expose all the clocks to the OS, such | ||
as in situations where those clks are used by drivers running in ARM secure | ||
execution levels. Such a configuration can be specified in device tree with the | ||
protected-clocks property in the form of a clock specifier list. This property should | ||
only be specified in the node that is providing the clocks being protected: | ||
|
||
clock-controller@a000f000 { | ||
compatible = "vendor,clk95; | ||
reg = <0xa000f000 0x1000> | ||
#clocks-cells = <1>; | ||
... | ||
protected-clocks = <UART3_CLK>, <SPI5_CLK>; | ||
}; | ||
This file has moved to the clock binding schema: | ||
https://github.com/devicetree-org/dt-schema/blob/main/dtschema/schemas/clock/clock.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.