Commit 1cc30cfc authored by Krzysztof Kozlowski's avatar Krzysztof Kozlowski
Browse files

Merge tag 'reset-fixes-for-v7.0-3' of https://git.pengutronix.de/git/pza/linux into arm/fixes

Reset controller fixes for v7.0, part 3

* Add missing reset ops for amlogic,t7-reset to the reset-meson driver.
  The resets are unused as of now, but as soon as they are, the driver
  would otherwise run into a NULL pointer dereference.

* tag 'reset-fixes-for-v7.0-3' of https://git.pengutronix.de/git/pza/linux

:
  reset: amlogic: t7: Fix null reset ops

Signed-off-by: default avatarKrzysztof Kozlowski <krzk@kernel.org>
parents 90ac4903 9797524e
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ static const struct meson_reset_param meson_s4_param = {
};

static const struct meson_reset_param t7_param = {
	.reset_ops	= &meson_reset_ops,
	.reset_num      = 224,
	.reset_offset	= 0x0,
	.level_offset   = 0x40,