Skip to content

Commit 2d11e9a

Browse files
committed
Merge branches 'clk-phase-errors', 'clk-amlogic', 'clk-renesas' and 'clk-allwinner' into clk-next
- Don't show clk phase when it is invalid * clk-phase-errors: clk: rockchip: fix mmc get phase clk: Fix phase init check clk: Bail out when calculating phase fails during clk registration clk: Move rate and accuracy recalc to mostly consumer APIs clk: Use 'parent' to shorten lines in __clk_core_init() clk: Don't cache errors from clk_ops::get_phase() * clk-amlogic: clk: meson: meson8b: set audio output clock hierarchy clk: meson: g12a: add support for the SPICC SCLK Source clocks dt-bindings: clk: g12a-clkc: add SPICC SCLK Source clock IDs clk: meson: gxbb: set audio output clock hierarchy clk: meson: gxbb: add the gxl internal dac gate dt-bindings: clk: meson: add the gxl internal dac gate * clk-renesas: dt-bindings: clock: renesas: cpg-mssr: Convert to json-schema clk: renesas: rcar-usb2-clock-sel: Add reset_control clk: renesas: rcar-usb2-clock-sel: Add multiple clocks management dt-bindings: clock: renesas: rcar-usb2-clock-sel: Add power-domains and resets properties dt-bindings: clock: renesas: rcar-usb2-clock-sel: Fix clock[-name]s properties clk: renesas: Remove use of ARCH_R8A7795 clk: renesas: r8a77965: Add RPC clocks clk: renesas: r8a7796: Add RPC clocks clk: renesas: r8a7795: Add RPC clocks clk: renesas: rcar-gen3: Add CCREE clocks * clk-allwinner: clk: sunxi-ng: sun8i-de2: Sort structures clk: sunxi-ng: sun8i-de2: Add R40 specific quirks clk: sunxi-ng: sun8i-de2: Add rotation core clocks and reset for A83T clk: sunxi-ng: sun8i-de2: Don't reuse A83T resets clk: sunxi-ng: sun8i-de2: H6 doesn't have rotate core clk: sunxi-ng: sun8i-de2: Add rotation core clocks and reset for A64 clk: sunxi-ng: sun8i-de2: Split out H5 definitions clk: sunxi-ng: a64: Export MBUS clock
5 parents ea0a1fb + d894992 + dfbfee8 + f58272b + 8ca1f3c commit 2d11e9a

22 files changed

+519
-222
lines changed

Documentation/devicetree/bindings/clock/renesas,cpg-mssr.txt

Lines changed: 0 additions & 100 deletions
This file was deleted.
Lines changed: 119 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,119 @@
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,cpg-mssr.yaml#"
5+
$schema: "http://devicetree.org/meta-schemas/core.yaml#"
6+
7+
title: Renesas Clock Pulse Generator / Module Standby and Software Reset
8+
9+
maintainers:
10+
- Geert Uytterhoeven <[email protected]>
11+
12+
description: |
13+
On Renesas ARM SoCs (SH/R-Mobile, R-Car, RZ), the CPG (Clock Pulse Generator)
14+
and MSSR (Module Standby and Software Reset) blocks are intimately connected,
15+
and share the same register block.
16+
17+
They provide the following functionalities:
18+
- The CPG block generates various core clocks,
19+
- The MSSR block provides two functions:
20+
1. Module Standby, providing a Clock Domain to control the clock supply
21+
to individual SoC devices,
22+
2. Reset Control, to perform a software reset of individual SoC devices.
23+
24+
properties:
25+
compatible:
26+
enum:
27+
- renesas,r7s9210-cpg-mssr # RZ/A2
28+
- renesas,r8a7743-cpg-mssr # RZ/G1M
29+
- renesas,r8a7744-cpg-mssr # RZ/G1N
30+
- renesas,r8a7745-cpg-mssr # RZ/G1E
31+
- renesas,r8a77470-cpg-mssr # RZ/G1C
32+
- renesas,r8a774a1-cpg-mssr # RZ/G2M
33+
- renesas,r8a774b1-cpg-mssr # RZ/G2N
34+
- renesas,r8a774c0-cpg-mssr # RZ/G2E
35+
- renesas,r8a7790-cpg-mssr # R-Car H2
36+
- renesas,r8a7791-cpg-mssr # R-Car M2-W
37+
- renesas,r8a7792-cpg-mssr # R-Car V2H
38+
- renesas,r8a7793-cpg-mssr # R-Car M2-N
39+
- renesas,r8a7794-cpg-mssr # R-Car E2
40+
- renesas,r8a7795-cpg-mssr # R-Car H3
41+
- renesas,r8a7796-cpg-mssr # R-Car M3-W
42+
- renesas,r8a77961-cpg-mssr # R-Car M3-W+
43+
- renesas,r8a77965-cpg-mssr # R-Car M3-N
44+
- renesas,r8a77970-cpg-mssr # R-Car V3M
45+
- renesas,r8a77980-cpg-mssr # R-Car V3H
46+
- renesas,r8a77990-cpg-mssr # R-Car E3
47+
- renesas,r8a77995-cpg-mssr # R-Car D3
48+
49+
reg:
50+
maxItems: 1
51+
52+
clocks:
53+
minItems: 1
54+
maxItems: 2
55+
56+
clock-names:
57+
minItems: 1
58+
maxItems: 2
59+
items:
60+
enum:
61+
- extal # All
62+
- extalr # Most R-Car Gen3 and RZ/G2
63+
- usb_extal # Most R-Car Gen2 and RZ/G1
64+
65+
'#clock-cells':
66+
description: |
67+
- For CPG core clocks, the two clock specifier cells must be "CPG_CORE"
68+
and a core clock reference, as defined in
69+
<dt-bindings/clock/*-cpg-mssr.h>
70+
- For module clocks, the two clock specifier cells must be "CPG_MOD" and
71+
a module number, as defined in the datasheet.
72+
const: 2
73+
74+
'#power-domain-cells':
75+
description:
76+
SoC devices that are part of the CPG/MSSR Clock Domain and can be
77+
power-managed through Module Standby should refer to the CPG device node
78+
in their "power-domains" property, as documented by the generic PM Domain
79+
bindings in Documentation/devicetree/bindings/power/power-domain.yaml.
80+
const: 0
81+
82+
'#reset-cells':
83+
description:
84+
The single reset specifier cell must be the module number, as defined in
85+
the datasheet.
86+
const: 1
87+
88+
if:
89+
not:
90+
properties:
91+
compatible:
92+
items:
93+
enum:
94+
- renesas,r7s9210-cpg-mssr
95+
then:
96+
required:
97+
- '#reset-cells'
98+
99+
required:
100+
- compatible
101+
- reg
102+
- clocks
103+
- clock-names
104+
- '#clock-cells'
105+
- '#power-domain-cells'
106+
107+
additionalProperties: false
108+
109+
examples:
110+
- |
111+
cpg: clock-controller@e6150000 {
112+
compatible = "renesas,r8a7795-cpg-mssr";
113+
reg = <0xe6150000 0x1000>;
114+
clocks = <&extal_clk>, <&extalr_clk>;
115+
clock-names = "extal", "extalr";
116+
#clock-cells = <2>;
117+
#power-domain-cells = <0>;
118+
#reset-cells = <1>;
119+
};

Documentation/devicetree/bindings/clock/renesas,rcar-usb2-clock-sel.txt

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,18 +38,29 @@ Required properties:
3838
- reg: offset and length of the USB 2.0 clock selector register block.
3939
- clocks: A list of phandles and specifier pairs.
4040
- clock-names: Name of the clocks.
41-
- The functional clock must be "ehci_ohci"
41+
- The functional clock of USB 2.0 host side must be "ehci_ohci"
42+
- The functional clock of HS-USB side must be "hs-usb-if"
4243
- The USB_EXTAL clock pin must be "usb_extal"
4344
- The USB_XTAL clock pin must be "usb_xtal"
4445
- #clock-cells: Must be 0
46+
- power-domains: A phandle and symbolic PM domain specifier.
47+
See power/renesas,rcar-sysc.yaml.
48+
- resets: A list of phandles and specifier pairs.
49+
- reset-names: Name of the resets.
50+
- The reset of USB 2.0 host side must be "ehci_ohci"
51+
- The reset of HS-USB side must be "hs-usb-if"
4552

4653
Example (R-Car H3):
4754

4855
usb2_clksel: clock-controller@e6590630 {
4956
compatible = "renesas,r8a7795-rcar-usb2-clock-sel",
5057
"renesas,rcar-gen3-usb2-clock-sel";
5158
reg = <0 0xe6590630 0 0x02>;
52-
clocks = <&cpg CPG_MOD 703>, <&usb_extal>, <&usb_xtal>;
53-
clock-names = "ehci_ohci", "usb_extal", "usb_xtal";
59+
clocks = <&cpg CPG_MOD 703>, <&cpg CPG_MOD 704>,
60+
<&usb_extal>, <&usb_xtal>;
61+
clock-names = "ehci_ohci", "hs-usb-if", "usb_extal", "usb_xtal";
5462
#clock-cells = <0>;
63+
power-domains = <&sysc R8A7795_PD_ALWAYS_ON>;
64+
resets = <&cpg 703>, <&cpg 704>;
65+
reset-names = "ehci_ohci", "hs-usb-if";
5566
};

0 commit comments

Comments
 (0)