From: Marek Behún <marek.behun@nic.cz>
Date: Sat, 9 Oct 2021 17:33:41 +0000 (+0200)
Subject: arm: mvebu: turris_mox: Always handle reset button
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=f3c71e75b08b7cbe35acc29d89e90c05edd70d40;p=u-boot.git

arm: mvebu: turris_mox: Always handle reset button

Handle reset button even if we can't configure modules.

This happens if we fail retrieving reset GPIO with which we can reset
the modules.

(Note that this GPIO is different from reset button GPIO.)

Signed-off-by: Marek Behún <marek.behun@nic.cz>
Reviewed-by: Stefan Roese <sr@denx.de>
---

diff --git a/board/CZ.NIC/turris_mox/turris_mox.c b/board/CZ.NIC/turris_mox/turris_mox.c
index ff0ed28045..7c5acfd1d9 100644
--- a/board/CZ.NIC/turris_mox/turris_mox.c
+++ b/board/CZ.NIC/turris_mox/turris_mox.c
@@ -617,7 +617,7 @@ int last_stage_init(void)
 
 	/* configure modules */
 	if (get_reset_gpio(&reset_gpio) < 0)
-		return 0;
+		goto handle_reset_btn;
 
 	if (peridot > 0) {
 		if (configure_peridots(&reset_gpio) < 0) {
@@ -654,6 +654,7 @@ int last_stage_init(void)
 		}
 	}
 
+handle_reset_btn:
 	handle_reset_button();
 
 	return 0;