Skip to content

Commit 475acef

Browse files
committed
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>
2 parents bc2fb47 + 03cb664 commit 475acef

4 files changed

Lines changed: 19 additions & 2 deletions

File tree

Documentation/devicetree/bindings/reset/hisilicon,hi3660-reset.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,11 @@ properties:
2424
- const: hisilicon,hi3670-reset
2525
- const: hisilicon,hi3660-reset
2626

27+
hisi,rst-syscon:
28+
deprecated: true
29+
description: phandle of the reset's syscon, use hisilicon,rst-syscon instead
30+
$ref: /schemas/types.yaml#/definitions/phandle
31+
2732
hisilicon,rst-syscon:
2833
description: phandle of the reset's syscon.
2934
$ref: /schemas/types.yaml#/definitions/phandle

Documentation/devicetree/bindings/reset/socionext,uniphier-reset.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ properties:
5555
"#reset-cells":
5656
const: 1
5757

58+
resets:
59+
maxItems: 1
60+
5861
additionalProperties: false
5962

6063
required:

drivers/reset/reset-rzg2l-usbphy-ctrl.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,9 @@ static int rzg2l_usbphy_ctrl_probe(struct platform_device *pdev)
121121
return dev_err_probe(dev, PTR_ERR(priv->rstc),
122122
"failed to get reset\n");
123123

124-
reset_control_deassert(priv->rstc);
124+
error = reset_control_deassert(priv->rstc);
125+
if (error)
126+
return error;
125127

126128
priv->rcdev.ops = &rzg2l_usbphy_ctrl_reset_ops;
127129
priv->rcdev.of_reset_n_cells = 1;

drivers/reset/tegra/reset-bpmp.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
2020
struct tegra_bpmp *bpmp = to_tegra_bpmp(rstc);
2121
struct mrq_reset_request request;
2222
struct tegra_bpmp_message msg;
23+
int err;
2324

2425
memset(&request, 0, sizeof(request));
2526
request.cmd = command;
@@ -30,7 +31,13 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc,
3031
msg.tx.data = &request;
3132
msg.tx.size = sizeof(request);
3233

33-
return tegra_bpmp_transfer(bpmp, &msg);
34+
err = tegra_bpmp_transfer(bpmp, &msg);
35+
if (err)
36+
return err;
37+
if (msg.rx.ret)
38+
return -EINVAL;
39+
40+
return 0;
3441
}
3542

3643
static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,

0 commit comments

Comments
 (0)