From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 14FD2C433F5 for ; Sat, 9 Oct 2021 17:35:39 +0000 (UTC) Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8B0EA6108B for ; Sat, 9 Oct 2021 17:35:38 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8B0EA6108B Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=lists.denx.de Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id ABFC4836A4; Sat, 9 Oct 2021 19:34:44 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=kernel.org header.i=@kernel.org header.b="ILYeWFWs"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 5EEFA83683; Sat, 9 Oct 2021 19:34:18 +0200 (CEST) Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 6614183699 for ; Sat, 9 Oct 2021 19:34:00 +0200 (CEST) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=kernel.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=kabel@kernel.org Received: by mail.kernel.org (Postfix) with ESMTPSA id 3715261090; Sat, 9 Oct 2021 17:33:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1633800839; bh=9YNroEdYUeakWEjLMhHBySny1Hibhio67X/eHcmzejU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ILYeWFWsvn83zxw89TiqTL2qE5UEzXbR3Z3LHmq7O0z35mane/phs89cOw77AA2it YZfWuDWVOIYAYD4YJ82hUvt8xeKX585ORM1uDeDL//QDgSaDHmVOWWUuatRMHqaNI5 928N6HoqBVk5jN48U6uJqQjWFu6wbbZuVebymGBlinK8X+GgZAnmog7r48Okri1ip4 /d7krHAAAtarp6Vg0dzTVwjvGaJrzmgsGLzB0hBErSJphXldIV+85WnkGgl8GGDNxb i1u6BnanyJdXtbg2V1MV86ewUiQFqLoG0k190Vn8ZX4kmLHMX7u3XNOSoMifinRXaO UlI11qDIKyBsg== From: =?UTF-8?q?Marek=20Beh=C3=BAn?= To: Stefan Roese Cc: u-boot@lists.denx.de, pali@kernel.org, =?UTF-8?q?Marek=20Beh=C3=BAn?= Subject: [PATCH u-boot-marvell 07/12] arm: mvebu: turris_mox: Always handle reset button Date: Sat, 9 Oct 2021 19:33:41 +0200 Message-Id: <20211009173346.7859-8-kabel@kernel.org> X-Mailer: git-send-email 2.32.0 In-Reply-To: <20211009173346.7859-1-kabel@kernel.org> References: <20211009173346.7859-1-kabel@kernel.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.34 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.2 at phobos.denx.de X-Virus-Status: Clean From: Marek Behún 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 --- 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; -- 2.32.0