Skip to content

Commit a97bf0c

Browse files
arndbarndb
committed
Merge tag 'reset-for-v6.16' of git://git.pengutronix.de/pza/linux into soc/drivers
Reset controller updates for v6.16 * Add T-HEAD TH1520 and Renesas RZ/V2H(P) USB2PHY reset controller drivers. * Add devm_reset_control_array_get_exclusive_released() variant to allow using the acquire/release hand-off mechanism for exclusive reset controls bundled into reset control arrays. * Add Sophgo SG2044 reset controller to device tree bindings. * tag 'reset-for-v6.16' of git://git.pengutronix.de/pza/linux: dt-bindings: reset: sophgo: Add SG2044 bindings. MAINTAINERS: Add entry for Renesas RZ/V2H(P) USB2PHY Port Reset driver reset: Add USB2PHY port reset driver for Renesas RZ/V2H(P) dt-bindings: reset: Document RZ/V2H(P) USB2PHY reset reset: Add devm_reset_control_array_get_exclusive_released() reset: thead: Add TH1520 reset controller driver dt-bindings: reset: Add T-HEAD TH1520 SoC Reset Controller Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnd Bergmann <[email protected]>
2 parents b892924 + 1c64de8 commit a97bf0c

File tree

10 files changed

+529
-1
lines changed

10 files changed

+529
-1
lines changed

‎Documentation/devicetree/bindings/reset/renesas,rzv2h-usb2phy-reset.yaml

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,56 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/reset/renesas,rzv2h-usb2phy-reset.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: Renesas RZ/V2H(P) USB2PHY Port reset Control
8+
9+
maintainers:
10+
- Lad Prabhakar <[email protected]>
11+
12+
description:
13+
The RZ/V2H(P) USB2PHY Control mainly controls Port reset and power down of the
14+
USB2.0 PHY.
15+
16+
properties:
17+
compatible:
18+
const: renesas,r9a09g057-usb2phy-reset # RZ/V2H(P)
19+
20+
reg:
21+
maxItems: 1
22+
23+
clocks:
24+
maxItems: 1
25+
26+
resets:
27+
maxItems: 1
28+
29+
power-domains:
30+
maxItems: 1
31+
32+
'#reset-cells':
33+
const: 0
34+
35+
required:
36+
- compatible
37+
- reg
38+
- clocks
39+
- resets
40+
- power-domains
41+
- '#reset-cells'
42+
43+
additionalProperties: false
44+
45+
examples:
46+
- |
47+
#include <dt-bindings/clock/renesas,r9a09g057-cpg.h>
48+
49+
reset-controller@15830000 {
50+
compatible = "renesas,r9a09g057-usb2phy-reset";
51+
reg = <0x15830000 0x10000>;
52+
clocks = <&cpg CPG_MOD 0xb6>;
53+
resets = <&cpg 0xaf>;
54+
power-domains = <&cpg>;
55+
#reset-cells = <0>;
56+
};

‎Documentation/devicetree/bindings/reset/sophgo,sg2042-reset.yaml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,12 @@ maintainers:
1111

1212
properties:
1313
compatible:
14-
const: sophgo,sg2042-reset
14+
oneOf:
15+
- items:
16+
- enum:
17+
- sophgo,sg2044-reset
18+
- const: sophgo,sg2042-reset
19+
- const: sophgo,sg2042-reset
1520

1621
reg:
1722
maxItems: 1

‎Documentation/devicetree/bindings/reset/thead,th1520-reset.yaml

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
2+
%YAML 1.2
3+
---
4+
$id: http://devicetree.org/schemas/reset/thead,th1520-reset.yaml#
5+
$schema: http://devicetree.org/meta-schemas/core.yaml#
6+
7+
title: T-HEAD TH1520 SoC Reset Controller
8+
9+
description:
10+
The T-HEAD TH1520 reset controller is a hardware block that asserts/deasserts
11+
resets for SoC subsystems.
12+
13+
maintainers:
14+
- Michal Wilczynski <[email protected]>
15+
16+
properties:
17+
compatible:
18+
enum:
19+
- thead,th1520-reset
20+
21+
reg:
22+
maxItems: 1
23+
24+
"#reset-cells":
25+
const: 1
26+
27+
required:
28+
- compatible
29+
- reg
30+
- "#reset-cells"
31+
32+
additionalProperties: false
33+
34+
examples:
35+
- |
36+
soc {
37+
#address-cells = <2>;
38+
#size-cells = <2>;
39+
rst: reset-controller@ffef528000 {
40+
compatible = "thead,th1520-reset";
41+
reg = <0xff 0xef528000 0x0 0x1000>;
42+
#reset-cells = <1>;
43+
};
44+
};

‎MAINTAINERS

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20673,6 +20673,14 @@ S: Maintained
2067320673
F: Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml
2067420674
F: drivers/usb/gadget/udc/renesas_usbf.c
2067520675

20676+
RENESAS RZ/V2H(P) USB2PHY PORT RESET DRIVER
20677+
M: Fabrizio Castro <[email protected]>
20678+
M: Lad Prabhakar <[email protected]>
20679+
L: [email protected]
20680+
S: Supported
20681+
F: Documentation/devicetree/bindings/reset/renesas,rzv2h-usb2phy-reset.yaml
20682+
F: drivers/reset/reset-rzv2h-usb2phy.c
20683+
2067620684
RENESAS RZ/V2M I2C DRIVER
2067720685
M: Fabrizio Castro <[email protected]>
2067820686
L: [email protected]
@@ -20885,15 +20893,18 @@ F: Documentation/devicetree/bindings/firmware/thead,th1520-aon.yaml
2088520893
F: Documentation/devicetree/bindings/mailbox/thead,th1520-mbox.yaml
2088620894
F: Documentation/devicetree/bindings/net/thead,th1520-gmac.yaml
2088720895
F: Documentation/devicetree/bindings/pinctrl/thead,th1520-pinctrl.yaml
20896+
F: Documentation/devicetree/bindings/reset/thead,th1520-reset.yaml
2088820897
F: arch/riscv/boot/dts/thead/
2088920898
F: drivers/clk/thead/clk-th1520-ap.c
2089020899
F: drivers/firmware/thead,th1520-aon.c
2089120900
F: drivers/mailbox/mailbox-th1520.c
2089220901
F: drivers/net/ethernet/stmicro/stmmac/dwmac-thead.c
2089320902
F: drivers/pinctrl/pinctrl-th1520.c
2089420903
F: drivers/pmdomain/thead/
20904+
F: drivers/reset/reset-th1520.c
2089520905
F: include/dt-bindings/clock/thead,th1520-clk-ap.h
2089620906
F: include/dt-bindings/power/thead,th1520-power.h
20907+
F: include/dt-bindings/reset/thead,th1520-reset.h
2089720908
F: include/linux/firmware/thead/thead,th1520-aon.h
2089820909

2089920910
RNBD BLOCK DRIVERS

‎drivers/reset/Kconfig

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,13 @@ config RESET_RZG2L_USBPHY_CTRL
225225
Support for USBPHY Control found on RZ/G2L family. It mainly
226226
controls reset and power down of the USB/PHY.
227227

228+
config RESET_RZV2H_USB2PHY
229+
tristate "Renesas RZ/V2H(P) (and similar SoCs) USB2PHY Reset driver"
230+
depends on ARCH_RENESAS || COMPILE_TEST
231+
help
232+
Support for USB2PHY Port reset Control found on the RZ/V2H(P) SoC
233+
(and similar SoCs).
234+
228235
config RESET_SCMI
229236
tristate "Reset driver controlled via ARM SCMI interface"
230237
depends on ARM_SCMI_PROTOCOL || COMPILE_TEST
@@ -279,6 +286,16 @@ config RESET_SUNXI
279286
help
280287
This enables the reset driver for Allwinner SoCs.
281288

289+
config RESET_TH1520
290+
tristate "T-HEAD 1520 reset controller"
291+
depends on ARCH_THEAD || COMPILE_TEST
292+
select REGMAP_MMIO
293+
help
294+
This driver provides support for the T-HEAD TH1520 SoC reset controller,
295+
which manages hardware reset lines for SoC components such as the GPU.
296+
Enable this option if you need to control hardware resets on TH1520-based
297+
systems.
298+
282299
config RESET_TI_SCI
283300
tristate "TI System Control Interface (TI-SCI) reset driver"
284301
depends on TI_SCI_PROTOCOL || (COMPILE_TEST && TI_SCI_PROTOCOL=n)

‎drivers/reset/Makefile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,13 @@ obj-$(CONFIG_RESET_QCOM_AOSS) += reset-qcom-aoss.o
3131
obj-$(CONFIG_RESET_QCOM_PDC) += reset-qcom-pdc.o
3232
obj-$(CONFIG_RESET_RASPBERRYPI) += reset-raspberrypi.o
3333
obj-$(CONFIG_RESET_RZG2L_USBPHY_CTRL) += reset-rzg2l-usbphy-ctrl.o
34+
obj-$(CONFIG_RESET_RZV2H_USB2PHY) += reset-rzv2h-usb2phy.o
3435
obj-$(CONFIG_RESET_SCMI) += reset-scmi.o
3536
obj-$(CONFIG_RESET_SIMPLE) += reset-simple.o
3637
obj-$(CONFIG_RESET_SOCFPGA) += reset-socfpga.o
3738
obj-$(CONFIG_RESET_SUNPLUS) += reset-sunplus.o
3839
obj-$(CONFIG_RESET_SUNXI) += reset-sunxi.o
40+
obj-$(CONFIG_RESET_TH1520) += reset-th1520.o
3941
obj-$(CONFIG_RESET_TI_SCI) += reset-ti-sci.o
4042
obj-$(CONFIG_RESET_TI_SYSCON) += reset-ti-syscon.o
4143
obj-$(CONFIG_RESET_TI_TPS380X) += reset-tps380x.o

0 commit comments

Comments
 (0)