leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reset controller fixes for v5.18

Browse Source 
Document the deprecated 'hisi,rst-syscon' device tree property for
 hisilicon,hi3660-reset, add an error check to reset deassertion in
 reset-rzg2l-usbphy-ctrl, restore transfer error handling in Tegra
 reset-bpmp, and document the optional 'resets' device tree property
 for socionext,uniphier-reset.
 -----BEGIN PGP SIGNATURE-----
 
 iI0EABYIADUWIQRRO6F6WdpH1R0vGibVhaclGDdiwAUCYk2xMxcccC56YWJlbEBw
 ZW5ndXRyb25peC5kZQAKCRDVhaclGDdiwNoCAQDzNzAsRRr1bga6xQ5pEGVrWRKz
 9IsRpS8pSKT5H1/I3QD/SjfZZOzHSpSUn6T74lUpCK/pxbFMJKX7OTWEC0Y4MQA=
 =cyfZ
 -----END PGP SIGNATURE-----
gpgsig -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEEo6/YBQwIrVS28WGKmmx57+YAGNkFAmJO22QACgkQmmx57+YA
 GNkVHw/+MSQOCRKg8vPEw/o2HTP+/mE+WE2CEYgAUiZIdDvY1N71XcZ3DjpxnpDV
 V2r5JJu90gja8th63fYJdn1Ga6q8SLgS4eVe99rTSx/TPxskOklaq+nJyaKaOMPk
 E9kmG50HZlta0z/As2HAlwzLL4HIeB2F0PHgiBqdWmSzCPN4/WemC3XXUbgVXgdD
 1Z/05aAAnZl7oGpD9QPfRXw2t+palaAy1MIczurtjSIVq5uPusq1krEsFtvUU1Nw
 QLWP73Pl+XzBLxW5qrlD4K88CiX+svmcDb+TA0eGjF+haMqaO6BajEWeCDKRdchP
 KDvvBH5h2mOzCl0IDkGIoggeqc5/fyaBOykYDAoW79CgBi6+qP8zF1WfOlJW8Pqr
 iNMb8wH1z1xNZN1nMoQ+/nxeJPN7bZYq6Mfnzjc8ZHemxksSsbl+4ICoJGl4yxGV
 fLr2adn5bIZYS87fD5KjmHNWdl/e5oU35/V2VIJ0ZfH9J9q5ty+tossvljEaCS0n
 RDJMHUp9WpiZBczBt4EKEwW4ywvC/tFVdiL/WBs7Dtc/r7Zpdn4tpflBrhWGiGtK
 PumaMADLTL9qORPWGE3OoTl2+CHt6XV+L4RYzmVBsRHOsUa9QZY/M8VLsXYE+m0E
 1bW0wNhDkFwpuX7ud1W40ZntOzIIrzGcEKxR0SRtP4ryU/+Gug0=
 =uf8k
 -----END PGP SIGNATURE-----

Merge tag 'reset-fixes-for-v5.18' of git://git.pengutronix.de/pza/linux into arm/fixes

Reset controller fixes for v5.18

Document the deprecated 'hisi,rst-syscon' device tree property for
hisilicon,hi3660-reset, add an error check to reset deassertion in
reset-rzg2l-usbphy-ctrl, restore transfer error handling in Tegra
reset-bpmp, and document the optional 'resets' device tree property
for socionext,uniphier-reset.

* tag 'reset-fixes-for-v5.18' of git://git.pengutronix.de/pza/linux:
  dt-bindings: reset: Add parent "resets" property as optional
  reset: tegra-bpmp: Restore Handle errors in BPMP response
  reset: renesas: Check return value of reset_control_deassert()
  dt-bindings: reset: document deprecated HiSilicon property

Link: https://lore.kernel.org/r/20220406153337.1265414-1-p.zabel@pengutronix.de
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Arnd Bergmann 2022-04-07 14:38:59 +02:00
commit 475acef9ed
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml
View File

@ -24,6 +24,11 @@ properties:
- const: hisilicon,hi3670-reset
- const: hisilicon,hi3660-reset
hisi,rst-syscon:
deprecated: true
description: phandle of the reset's syscon, use hisilicon,rst-syscon instead
$ref: /schemas/types.yaml#/definitions/phandle
hisilicon,rst-syscon:
description: phandle of the reset's syscon.
$ref: /schemas/types.yaml#/definitions/phandle

3
Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml
View File

@ -55,6 +55,9 @@ properties:
"#reset-cells":
const: 1
resets:
maxItems: 1
additionalProperties: false
required:

4
drivers/reset/reset-rzg2l-usbphy-ctrl.c
View File

@ -121,7 +121,9 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev)
return dev_err_probe(dev, PTR_ERR(priv->rstc),
"failed to get reset\n");
reset_control_deassert(priv->rstc);
error = reset_control_deassert(priv->rstc);
if (error)
return error;
priv->rcdev.ops = &rzg2l_usbphy_ctrl_reset_ops;
priv->rcdev.of_reset_n_cells = 1;

9
drivers/reset/tegra/reset-bpmp.c
View File

@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
struct tegra_bpmp *bpmp = to_tegra_bpmp(rstc);
struct mrq_reset_request request;
struct tegra_bpmp_message msg;
int err;
memset(&request, 0, sizeof(request));
request.cmd = command;
@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
msg.tx.data = &request;
msg.tx.size = sizeof(request);
return tegra_bpmp_transfer(bpmp, &msg);
err = tegra_bpmp_transfer(bpmp, &msg);
if (err)
return err;
if (msg.rx.ret)
return -EINVAL;
return 0;
}
static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,