[PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button

Stefan Roese sr at denx.de
Thu Oct 21 07:32:41 CEST 2021


On 09.10.21 19:33, Marek Behún wrote:
> From: Marek Behún <marek.behun at nic.cz>
> 
> 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 at nic.cz>

Reviewed-by: Stefan Roese <sr at denx.de>

Thanks,
Stefan

> ---
>   board/CZ.NIC/turris_mox/turris_mox.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)
> 
> 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;
> 


Viele Grüße,
Stefan

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: sr at denx.de


More information about the U-Boot mailing list