From patchwork Mon Nov 6 16:33:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1860279 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=SxWLsbea; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPH5D01Kqz1yQK for ; Tue, 7 Nov 2023 03:35:11 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 9537687137; Mon, 6 Nov 2023 17:33:34 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="SxWLsbea"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id AA5358715B; Mon, 6 Nov 2023 17:33:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x731.google.com (mail-qk1-x731.google.com [IPv6:2607:f8b0:4864:20::731]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 34C9C86FF4 for ; Mon, 6 Nov 2023 17:33:29 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-qk1-x731.google.com with SMTP id af79cd13be357-778a25cad6dso20894985a.0 for ; Mon, 06 Nov 2023 08:33:29 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699288408; x=1699893208; darn=lists.denx.de; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=5ac8wda8A2f5qn7q6xsYEyagdbLtJ4niwDPheQw5ZVs=; b=SxWLsbeatWu0fwsd47RdK/7Fxcs0RyRUNdtVK3oj6hVzWz1Iql75dq5cBjcOJMdRBC pYjt6ypxEBwiRJPaDnoVys3Xbbe61bQMbKR46FliwXlJ4ihMmywrbulXEozulSaGRcvj M+DRnWLz4LxcQkielGmBEUgyvK/T2m67PVv7a+vcRA2JVCW0KvW452rRNMUbYRKWH0fG bJebuod70g7kmjK8aa2ycxphF9/4nXBwX6fdnlyTZMAvFy5gVsOE/p26YRDImcgVTY/m XyXsipSJh5pEpfDHChtXfl6NOxQZ8uW8RrXKDCiytFTBJCN8nOzoZQmcYjcde7OknM0o Cn6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699288408; x=1699893208; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=5ac8wda8A2f5qn7q6xsYEyagdbLtJ4niwDPheQw5ZVs=; b=wAi22P44QVyKZjpSdUhj8Xfsx/RqoWSQE3bVJnkffGmBcAoku4Og9JO0cvSnYd6R7R InirrpJn0AdvkK1ytTkaV6AToCR2Gx8piNe9oCjURnRkndAR5ivJG4ChsM/VYLnBPGB2 je4bAt7gQySsEz2XYsvCg7XnNjRUJzQRmtkGQYZWUD/4SMwxHCpCx/p+0Kz0E93QB6yC ZNSR4PVUcsDehrmkoCVzrZ4AcXcCbjVOi91MbkBRqsf7PklQ6QCzDToHxCl2QIvohNu9 wB4Y41pW/1Lek9W39a5Afjn5chIndx1h5I0F6k+nlB4nKyBwpLT9ruOKwPnK+RRiDYGX ociw== X-Gm-Message-State: AOJu0YwEEfYWy9tdd99lR06A/KxODDKctUfMggO8MsIq9vbeMnUd2ouw kEcJxVmb34QieQHtp6856dK4I3aBfHI= X-Google-Smtp-Source: AGHT+IHN0DpG5VrrEtzoqIuyFETHP1agvtY1WXpqfMIJr2jk8L93kj9nJvrtnP6Am56FXm99BxCiog== X-Received: by 2002:a05:620a:1a1a:b0:773:a789:cd15 with SMTP id bk26-20020a05620a1a1a00b00773a789cd15mr33598563qkb.6.1699288407876; Mon, 06 Nov 2023 08:33:27 -0800 (PST) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:91e3:ce2:e2f8:4628]) by smtp.gmail.com with ESMTPSA id az42-20020a05620a172a00b0077407e3d68asm3407235qkb.111.2023.11.06.08.33.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 08:33:27 -0800 (PST) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH 1/2] imx7s-warp-u-boot: Fix aliases and chosen nodes indentation Date: Mon, 6 Nov 2023 13:33:22 -0300 Message-Id: <20231106163323.2883561-1-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam The aliases and chosen nodes are currently indented using spaces. Fix them to use the standard tab indentation. Signed-off-by: Fabio Estevam --- arch/arm/dts/imx7s-warp-u-boot.dtsi | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi index 49b992dcccaf..4f44598c9a27 100644 --- a/arch/arm/dts/imx7s-warp-u-boot.dtsi +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -1,12 +1,12 @@ / { - aliases { - mmc0 = &usdhc3; - usb0 = &usbotg1; - }; + aliases { + mmc0 = &usdhc3; + usb0 = &usbotg1; + }; - chosen { - stdout-path = &uart1; - }; + chosen { + stdout-path = &uart1; + }; }; &aips3 { From patchwork Mon Nov 6 16:33:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabio Estevam X-Patchwork-Id: 1860280 X-Patchwork-Delegate: sbabic@denx.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=L2E/5hIO; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de (client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=patchwork.ozlabs.org) Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPH5R2gBKz1yQK for ; Tue, 7 Nov 2023 03:35:23 +1100 (AEDT) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 1E45C8715B; Mon, 6 Nov 2023 17:33:35 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com 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=gmail.com header.i=@gmail.com header.b="L2E/5hIO"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id DD6E187125; Mon, 6 Nov 2023 17:33:33 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-qk1-x736.google.com (mail-qk1-x736.google.com [IPv6:2607:f8b0:4864:20::736]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 050F587137 for ; Mon, 6 Nov 2023 17:33:31 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=festevam@gmail.com Received: by mail-qk1-x736.google.com with SMTP id af79cd13be357-779d0c05959so74932485a.1 for ; Mon, 06 Nov 2023 08:33:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699288410; x=1699893210; darn=lists.denx.de; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=3y3Hl/+H9Cx5g0N51QiyyRoWJ3VktASOb4zi0ZFlQfw=; b=L2E/5hIO8oRnX6x2J6uFzQEA/3z/6qBwcCSd3TZnODVdG33XzcYJccqVRsW+icfJJC vutsQwX0TR59CMabsFYfs1sqy2gBiI5jQRhVuCazMdA/NhpRA629sSjnnkygKnefEMIp a1skGjbmxcLwMpnz/0ZbkSnNLlj5IdfJr7abRGYvOddnLW7EdbdfBfLPjSzjbhbQBkyG 13NBy8sc26bx3VbpSWmnIeJ31FyOlM3rjmbqv0pCeOaw2P+EQWI6lZcASc4rBZGtXwPN krQNw8IDi53RQOF58i/L02lSdiOLUuRTNJn292FOaMwkOauGp24OSmSdkyGtVJ1puM6V H9tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699288410; x=1699893210; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3y3Hl/+H9Cx5g0N51QiyyRoWJ3VktASOb4zi0ZFlQfw=; b=qO/ttqOcwiu8qDaep3uP8BiLxZFExEqBC0TPBZdJw/elwt8MP79iJNPEHvMjFDCgPW fpBwCRPMC6+L9YkCut2HY2zYPCz+u9bkNPSI14X7dr/wUT+P3+UNyzVniEE5hVYfycMb GIRUtaoNpAIzkPpQgyk+U1HBGP5ExK/Rr5mUidSOTronM6CJ4fTvRPNnfAvbOm2C4O/s HIGIlJMrgc+9/J3ee+1RoGKaz+xTtGuXPwYMfza+32++wf/jFI8Ytj7n3tC/hMRI64mJ K4QbIlO9aVXCFiFKns4k+7CU2+cZtNZ0fItCyF6zhk5ZEtXaMV6Cx7m/cXQWSYTS6qUT aujA== X-Gm-Message-State: AOJu0Yx+SzrUzEDp8lWkEdJTT3QmJDolkxqxYh8zTB/bWwN6F52VlgCV T9s+NWDGm67l2RsQtOofW5TZAzgkmOc= X-Google-Smtp-Source: AGHT+IFH6dRRGvKVnk6ENXYkJ7BvVi2BFQ1HfKWNd3wliIQYA4Su8mIhb4vWYHrUYuF2rjj9lYJWsw== X-Received: by 2002:a05:620a:2711:b0:778:9b9f:ccbb with SMTP id b17-20020a05620a271100b007789b9fccbbmr32212298qkp.0.1699288409646; Mon, 06 Nov 2023 08:33:29 -0800 (PST) Received: from fabio-Precision-3551.. ([2804:14c:485:4b61:91e3:ce2:e2f8:4628]) by smtp.gmail.com with ESMTPSA id az42-20020a05620a172a00b0077407e3d68asm3407235qkb.111.2023.11.06.08.33.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 08:33:29 -0800 (PST) From: Fabio Estevam To: sbabic@denx.de Cc: u-boot@lists.denx.de, Fabio Estevam Subject: [PATCH 2/2] warp7: Convert to watchdog driver model Date: Mon, 6 Nov 2023 13:33:23 -0300 Message-Id: <20231106163323.2883561-2-festevam@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231106163323.2883561-1-festevam@gmail.com> References: <20231106163323.2883561-1-festevam@gmail.com> MIME-Version: 1.0 X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 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.8 at phobos.denx.de X-Virus-Status: Clean From: Fabio Estevam Commit 68dcbdd594d4 ("ARM: imx: Add weak default reset_cpu()") caused the 'reset' command in U-Boot to not cause a board reset. Fix it by switching to the watchdog driver model via sysreset, which is the preferred method for implementing the watchdog reset. Signed-off-by: Fabio Estevam --- arch/arm/dts/imx7s-warp-u-boot.dtsi | 10 ++++++++++ configs/warp7_defconfig | 3 +++ 2 files changed, 13 insertions(+) diff --git a/arch/arm/dts/imx7s-warp-u-boot.dtsi b/arch/arm/dts/imx7s-warp-u-boot.dtsi index 4f44598c9a27..98784fd7a2ef 100644 --- a/arch/arm/dts/imx7s-warp-u-boot.dtsi +++ b/arch/arm/dts/imx7s-warp-u-boot.dtsi @@ -7,6 +7,12 @@ chosen { stdout-path = &uart1; }; + + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + bootph-pre-ram; + }; }; &aips3 { @@ -24,3 +30,7 @@ &uart1 { bootph-all; }; + +&wdog1 { + bootph-pre-ram; +}; diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 26d992d3c2d8..4ceb0a4f2917 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -67,6 +67,8 @@ CONFIG_DM_REGULATOR_GPIO=y CONFIG_SPECIFY_CONSOLE_INDEX=y CONFIG_DM_SERIAL=y CONFIG_MXC_UART=y +CONFIG_SYSRESET=y +CONFIG_SYSRESET_WATCHDOG=y CONFIG_IMX_THERMAL=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y @@ -80,5 +82,6 @@ CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_USB_ETH_CDC=y CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +CONFIG_IMX_WATCHDOG=y CONFIG_OPTEE_TZDRAM_SIZE=0x3000000 CONFIG_BOOTM_OPTEE=y