Unverified Commit 475acef9 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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: default avatarArnd Bergmann <arnd@arndb.de>
parents bc2fb47d 03cb6646

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

+5 −0
Original line number Diff line number Diff line
@@ -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

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

+3 −0
Original line number Diff line number Diff line
@@ -55,6 +55,9 @@ properties: 
  "#reset-cells":

    const: 1



  resets:

    maxItems: 1



additionalProperties: false



required:

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

+3 −1
Original line number Diff line number Diff line
@@ -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;

drivers/reset/tegra/reset-bpmp.c

+8 −1
Original line number Diff line number Diff line
@@ -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,