Skip to content

Commit 5b1c4d8

Browse files
committed
Merge tag 'renesas-pinctrl-for-v7.2-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers into devel
pinctrl: renesas: Updates for v7.2 - Save/restore more registers during suspend/resume on the RZ/G2L and RZ/V2H SoC families, - Add support for the RZ/G3L (R9A08G046) SoC, - Add support for pinconf-groups in debugfs on EMMA Mobile, SH/R-Mobile, R-Car, RZ/G1, and RZ/G2 SoCs, - Miscellaneous fixes and improvements. Signed-off-by: Linus Walleij <linusw@kernel.org>
2 parents 42ec31e + c7c8352 commit 5b1c4d8

5 files changed

Lines changed: 671 additions & 30 deletions

File tree

Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ properties:
2626
- renesas,r9a07g043-pinctrl # RZ/G2UL{Type-1,Type-2} and RZ/Five
2727
- renesas,r9a07g044-pinctrl # RZ/G2{L,LC}
2828
- renesas,r9a08g045-pinctrl # RZ/G3S
29+
- renesas,r9a08g046-pinctrl # RZ/G3L
2930
- renesas,r9a09g047-pinctrl # RZ/G3E
3031
- renesas,r9a09g056-pinctrl # RZ/V2N
3132
- renesas,r9a09g057-pinctrl # RZ/V2H(P)
@@ -78,6 +79,26 @@ properties:
7879
- description: PFC main reset
7980
- description: Reset for the control register related to WDTUDFCA and WDTUDFFCM pins
8081

82+
reset-names:
83+
oneOf:
84+
- items:
85+
- const: rstn
86+
- const: port
87+
- const: spare
88+
- items:
89+
- const: main
90+
- const: error
91+
92+
renesas,clonech:
93+
$ref: /schemas/types.yaml#/definitions/phandle-array
94+
items:
95+
- items:
96+
- description: phandle to system controller
97+
- description: offset of clone channel control register
98+
description:
99+
Phandle and offset to the system controller containing the clone channel
100+
control values.
101+
81102
additionalProperties:
82103
anyOf:
83104
- type: object
@@ -140,6 +161,15 @@ additionalProperties:
140161
allOf:
141162
- $ref: pinctrl.yaml#
142163

164+
- if:
165+
properties:
166+
compatible:
167+
contains:
168+
const: renesas,r9a08g046-pinctrl
169+
then:
170+
required:
171+
- renesas,clonech
172+
143173
- if:
144174
properties:
145175
compatible:
@@ -152,10 +182,14 @@ allOf:
152182
properties:
153183
resets:
154184
maxItems: 2
185+
reset-names:
186+
maxItems: 2
155187
else:
156188
properties:
157189
resets:
158190
minItems: 3
191+
reset-names:
192+
minItems: 3
159193

160194
required:
161195
- compatible
@@ -187,6 +221,7 @@ examples:
187221
resets = <&cpg R9A07G044_GPIO_RSTN>,
188222
<&cpg R9A07G044_GPIO_PORT_RESETN>,
189223
<&cpg R9A07G044_GPIO_SPARE_RESETN>;
224+
reset-names = "rstn", "port", "spare";
190225
power-domains = <&cpg>;
191226
192227
scif0_pins: serial0 {

0 commit comments

Comments
 (0)