Unverified Commit 1e3dbfbb authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

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

Reset controller fixes for v5.16

Well, just one: revert commit c045ceb5 ("reset: tegra-bpmp: Handle
errors in BPMP response"), which exposed an issue with the Tegra194 HDA
controller reset. BPMP response error handling will be reinstated once
there's a fix for the HDA issue.

* tag 'reset-fixes-for-v5.16' of git://git.pengutronix.de/pza/linux

:
  reset: tegra-bpmp: Revert Handle errors in BPMP response

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0fcfb00b 69125b4b

drivers/reset/tegra/reset-bpmp.c

+1 −8
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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;
@@ -31,13 +30,7 @@ static int tegra_bpmp_reset_common(struct reset_controller_dev *rstc, 
	msg.tx.data = &request;

	msg.tx.size = sizeof(request);



	err = tegra_bpmp_transfer(bpmp, &msg);

	if (err)

		return err;

	if (msg.rx.ret)

		return -EINVAL;



	return 0;

	return tegra_bpmp_transfer(bpmp, &msg);

}



static int tegra_bpmp_reset_module(struct reset_controller_dev *rstc,