Skip to content

Commit b2f8240

Browse files
committed
Merge branches 'clk-mobileye', 'clk-twl', 'clk-nuvoton', 'clk-renesas' and 'clk-bindings' into clk-next
- Mobileye EyeQ5, EyeQ6L and EyeQ6H clk driver - TWL6030 clk driver - Nuvoton Arbel BMC NPCM8XX SoC clks - Convert more clk bindings to YAML * clk-mobileye: clk: eyeq: add EyeQ6H west fixed factor clocks clk: eyeq: add EyeQ6H central fixed factor clocks clk: eyeq: add EyeQ5 fixed factor clocks clk: eyeq: add fixed factor clocks infrastructure clk: eyeq: require clock index with phandle in all cases clk: fixed-factor: add clk_hw_register_fixed_factor_index() function dt-bindings: clock: eyeq: add more Mobileye EyeQ5/EyeQ6H clocks dt-bindings: soc: mobileye: set `#clock-cells = <1>` for all compatibles clk: eyeq: add driver clk: divider: Introduce CLK_DIVIDER_EVEN_INTEGERS flag dt-bindings: clock: add Mobileye EyeQ6L/EyeQ6H clock indexes Revert "dt-bindings: clock: mobileye,eyeq5-clk: add bindings" * clk-twl: clk: twl: add TWL6030 support clk: twl: remove is_prepared * clk-nuvoton: clk: npcm8xx: add clock controller reset: npcm: register npcm8xx clock auxiliary bus device dt-bindings: reset: npcm: add clock properties * clk-renesas: clk: renesas: vbattb: Add VBATTB clock driver clk: Add devm_clk_hw_register_gate_parent_hw() clk: renesas: rzg2l: Fix FOUTPOSTDIV clk dt-bindings: clock: renesas,r9a08g045-vbattb: Document VBATTB clk: renesas: r9a08g045: Add power domain for RTC clk: renesas: r9a08g045: Mark the watchdog and always-on PM domains as IRQ safe clk: renesas: rzg2l-cpg: Use GENPD_FLAG_* flags instead of local ones clk: renesas: rzg2l-cpg: Move PM domain power on in rzg2l_cpg_pd_setup() dt-bindings: clock: r9a08g045-cpg: Add power domain ID for RTC clk: renesas: r8a779h0: Drop CLK_PLL2_DIV2 to clarify ZCn clocks clk: renesas: r9a09g057: Add clock and reset entries for ICU clk: renesas: r9a09g057: Add CA55 core clocks clk: renesas: Remove duplicate and trailing empty lines * clk-bindings: dt-bindings: clock: actions,owl-cmu: convert to YAML dt-bindings: clock: ti: Convert mux.txt to json-schema dt-bindings: clock: ti: Convert divider.txt to json-schema dt-bindings: clock: ti: Convert interface.txt to json-schema dt-bindings: clock: convert rockchip,rk3328-cru.txt to YAML
6 parents 6af88cc + 1cbdfcf + 9abc1eb + e0b255d + 0c15963 + 53454b7 commit b2f8240

Some content is hidden

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

46 files changed

+2492
-562
lines changed

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

Lines changed: 0 additions & 52 deletions
This file was deleted.
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/actions,owl-cmu.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Actions Semi Owl Clock Management Unit (CMU)
8+
9+
maintainers:
10+
- Manivannan Sadhasivam <[email protected]>
11+
12+
description: |
13+
The Actions Semi Owl Clock Management Unit generates and supplies clock
14+
to various controllers within the SoC.
15+
16+
See also:
17+
include/dt-bindings/clock/actions,s500-cmu.h
18+
include/dt-bindings/clock/actions,s700-cmu.h
19+
include/dt-bindings/clock/actions,s900-cmu.h
20+
21+
properties:
22+
compatible:
23+
enum:
24+
- actions,s500-cmu
25+
- actions,s700-cmu
26+
- actions,s900-cmu
27+
28+
reg:
29+
maxItems: 1
30+
31+
clocks:
32+
items:
33+
- description: Host oscillator source
34+
- description: Internal low frequency oscillator source
35+
36+
"#clock-cells":
37+
const: 1
38+
39+
"#reset-cells":
40+
const: 1
41+
42+
required:
43+
- compatible
44+
- reg
45+
- clocks
46+
- "#clock-cells"
47+
- "#reset-cells"
48+
49+
additionalProperties: false
50+
51+
examples:
52+
- |
53+
clock-controller@e0160000 {
54+
compatible = "actions,s900-cmu";
55+
reg = <0xe0160000 0x1000>;
56+
clocks = <&hosc>, <&losc>;
57+
#clock-cells = <1>;
58+
#reset-cells = <1>;
59+
};
60+
...

Documentation/devicetree/bindings/clock/mobileye,eyeq5-clk.yaml

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 84 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,84 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/renesas,r9a08g045-vbattb.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas Battery Backup Function (VBATTB)
8+
9+
description:
10+
Renesas VBATTB is an always on powered module (backed by battery) which
11+
controls the RTC clock (VBATTCLK), tamper detection logic and a small
12+
general usage memory (128B).
13+
14+
maintainers:
15+
- Claudiu Beznea <[email protected]>
16+
17+
properties:
18+
compatible:
19+
const: renesas,r9a08g045-vbattb
20+
21+
reg:
22+
maxItems: 1
23+
24+
interrupts:
25+
items:
26+
- description: tamper detector interrupt
27+
28+
clocks:
29+
items:
30+
- description: VBATTB module clock
31+
- description: RTC input clock (crystal or external clock device)
32+
33+
clock-names:
34+
items:
35+
- const: bclk
36+
- const: rtx
37+
38+
'#clock-cells':
39+
const: 1
40+
41+
power-domains:
42+
maxItems: 1
43+
44+
resets:
45+
items:
46+
- description: VBATTB module reset
47+
48+
quartz-load-femtofarads:
49+
description: load capacitance of the on board crystal
50+
enum: [ 4000, 7000, 9000, 12500 ]
51+
default: 4000
52+
53+
required:
54+
- compatible
55+
- reg
56+
- interrupts
57+
- clocks
58+
- clock-names
59+
- '#clock-cells'
60+
- power-domains
61+
- resets
62+
63+
additionalProperties: false
64+
65+
examples:
66+
- |
67+
#include <dt-bindings/clock/r9a08g045-cpg.h>
68+
#include <dt-bindings/clock/renesas,r9a08g045-vbattb.h>
69+
#include <dt-bindings/interrupt-controller/arm-gic.h>
70+
#include <dt-bindings/interrupt-controller/irq.h>
71+
72+
clock-controller@1005c000 {
73+
compatible = "renesas,r9a08g045-vbattb";
74+
reg = <0x1005c000 0x1000>;
75+
interrupts = <GIC_SPI 43 IRQ_TYPE_LEVEL_HIGH>;
76+
clocks = <&cpg CPG_MOD R9A08G045_VBAT_BCLK>, <&vbattb_xtal>;
77+
clock-names = "bclk", "rtx";
78+
assigned-clocks = <&vbattb VBATTB_MUX>;
79+
assigned-clock-parents = <&vbattb VBATTB_XC>;
80+
#clock-cells = <1>;
81+
power-domains = <&cpg>;
82+
resets = <&cpg R9A08G045_VBAT_BRESETN>;
83+
quartz-load-femtofarads = <12500>;
84+
};

Documentation/devicetree/bindings/clock/rockchip,rk3328-cru.txt

Lines changed: 0 additions & 58 deletions
This file was deleted.
Lines changed: 74 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,74 @@
1+
# SPDX-License-Identifier: GPL-2.0
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/clock/rockchip,rk3328-cru.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Rockchip RK3328 Clock and Reset Unit (CRU)
8+
9+
maintainers:
10+
- Elaine Zhang <[email protected]>
11+
- Heiko Stuebner <[email protected]>
12+
13+
description: |
14+
The RK3328 clock controller generates and supplies clocks to various
15+
controllers within the SoC and also implements a reset controller for SoC
16+
peripherals.
17+
Each clock is assigned an identifier and client nodes can use this identifier
18+
to specify the clock which they consume. All available clocks are defined as
19+
preprocessor macros in the dt-bindings/clock/rk3328-cru.h headers and can be
20+
used in device tree sources. Similar macros exist for the reset sources in
21+
these files.
22+
There are several clocks that are generated outside the SoC. It is expected
23+
that they are defined using standard clock bindings with following
24+
clock-output-names:
25+
- "xin24m" - crystal input - required,
26+
- "clkin_i2s" - external I2S clock - optional,
27+
- "gmac_clkin" - external GMAC clock - optional
28+
- "phy_50m_out" - output clock of the pll in the mac phy
29+
- "hdmi_phy" - output clock of the hdmi phy pll - optional
30+
31+
properties:
32+
compatible:
33+
enum:
34+
- rockchip,rk3328-cru
35+
36+
reg:
37+
maxItems: 1
38+
39+
"#clock-cells":
40+
const: 1
41+
42+
"#reset-cells":
43+
const: 1
44+
45+
clocks:
46+
maxItems: 1
47+
48+
clock-names:
49+
const: xin24m
50+
51+
rockchip,grf:
52+
$ref: /schemas/types.yaml#/definitions/phandle
53+
description:
54+
Phandle to the syscon managing the "general register files" (GRF),
55+
if missing pll rates are not changeable, due to the missing pll
56+
lock status.
57+
58+
required:
59+
- compatible
60+
- reg
61+
- "#clock-cells"
62+
- "#reset-cells"
63+
64+
additionalProperties: false
65+
66+
examples:
67+
- |
68+
cru: clock-controller@ff440000 {
69+
compatible = "rockchip,rk3328-cru";
70+
reg = <0xff440000 0x1000>;
71+
rockchip,grf = <&grf>;
72+
#clock-cells = <1>;
73+
#reset-cells = <1>;
74+
};

Documentation/devicetree/bindings/clock/ti/composite.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ merged to this clock. The component clocks shall be of one of the
1616
"ti,*composite*-clock" types.
1717

1818
[1] Documentation/devicetree/bindings/clock/clock-bindings.txt
19-
[2] Documentation/devicetree/bindings/clock/ti/mux.txt
20-
[3] Documentation/devicetree/bindings/clock/ti/divider.txt
19+
[2] Documentation/devicetree/bindings/clock/ti/ti,mux-clock.yaml
20+
[3] Documentation/devicetree/bindings/clock/ti/ti,divider-clock.yaml
2121
[4] Documentation/devicetree/bindings/clock/ti/gate.txt
2222

2323
Required properties:

0 commit comments

Comments
 (0)