{"id":1157053,"url":"http://patchwork.ozlabs.org/api/patches/1157053/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/patch/20190903143850.9824-10-lukma@denx.de/","project":{"id":18,"url":"http://patchwork.ozlabs.org/api/projects/18/?format=json","name":"U-Boot","link_name":"uboot","list_id":"u-boot.lists.denx.de","list_email":"u-boot@lists.denx.de","web_url":null,"scm_url":null,"webscm_url":null,"list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20190903143850.9824-10-lukma@denx.de>","list_archive_url":null,"date":"2019-09-03T14:38:45","name":"[U-Boot,v2,09/14] DM: WDT: Convert WDT driver to use DM/DTS (including SYSRESET)","commit_ref":"d5354f59d072210b469f099c8ee313e0f17c28e6","pull_url":null,"state":"accepted","archived":false,"hash":"fb429834bc78865e64b8272f9cbdd76acca45082","submitter":{"id":70701,"url":"http://patchwork.ozlabs.org/api/people/70701/?format=json","name":"Lukasz Majewski","email":"lukma@denx.de"},"delegate":{"id":1693,"url":"http://patchwork.ozlabs.org/api/users/1693/?format=json","username":"sbabic","first_name":"Stefano","last_name":"Babic","email":"sbabic@denx.de"},"mbox":"http://patchwork.ozlabs.org/project/uboot/patch/20190903143850.9824-10-lukma@denx.de/mbox/","series":[{"id":128783,"url":"http://patchwork.ozlabs.org/api/series/128783/?format=json","web_url":"http://patchwork.ozlabs.org/project/uboot/list/?series=128783","date":"2019-09-03T14:38:36","name":"DM: display5: Convert display5 board to DM/DTS (including 'factory' setup)","version":2,"mbox":"http://patchwork.ozlabs.org/series/128783/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1157053/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1157053/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":["ozlabs.org;\n\tspf=none (mailfrom) smtp.mailfrom=lists.denx.de\n\t(client-ip=81.169.180.215; helo=lists.denx.de;\n\tenvelope-from=u-boot-bounces@lists.denx.de;\n\treceiver=)","ozlabs.org;\n\tdmarc=none (p=none dis=none) header.from=denx.de"],"Received":["from lists.denx.de (dione.denx.de [81.169.180.215])\n\tby ozlabs.org (Postfix) with ESMTP id 46N8qM1sjMz9s7T\n\tfor ;\n\tWed, 4 Sep 2019 00:44:31 +1000 (AEST)","by lists.denx.de (Postfix, from userid 105)\n\tid C3C9DC21E1E; Tue, 3 Sep 2019 14:40:38 +0000 (UTC)","from lists.denx.de (localhost [IPv6:::1])\n\tby lists.denx.de (Postfix) with ESMTP id 7F5CEC21D8E;\n\tTue, 3 Sep 2019 14:40:37 +0000 (UTC)","by lists.denx.de (Postfix, from userid 105)\n\tid 71139C21DB3; Tue, 3 Sep 2019 14:39:26 +0000 (UTC)","from mail-out.m-online.net (mail-out.m-online.net [212.18.0.9])\n\tby lists.denx.de (Postfix) with ESMTPS id 77532C21E0B\n\tfor ; Tue, 3 Sep 2019 14:39:24 +0000 (UTC)","from frontend01.mail.m-online.net (unknown [192.168.8.182])\n\tby mail-out.m-online.net (Postfix) with ESMTP id 46N8jS28wwz1rLlH;\n\tTue, 3 Sep 2019 16:39:24 +0200 (CEST)","from localhost (dynscan1.mnet-online.de [192.168.6.70])\n\tby mail.m-online.net (Postfix) with ESMTP id 46N8jS1YHKz1qqkB;\n\tTue, 3 Sep 2019 16:39:24 +0200 (CEST)","from mail.mnet-online.de ([192.168.8.182])\n\tby localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new,\n\tport 10024)\n\twith ESMTP id 38bJaB7KFXCF; Tue, 3 Sep 2019 16:39:22 +0200 (CEST)","from localhost.localdomain (85-222-111-42.dynamic.chello.pl\n\t[85.222.111.42])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby mail.mnet-online.de (Postfix) with ESMTPSA;\n\tTue, 3 Sep 2019 16:39:22 +0200 (CEST)"],"X-Spam-Checker-Version":"SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de","X-Spam-Level":"","X-Spam-Status":"No, score=0.0 required=5.0 tests=none autolearn=unavailable\n\tautolearn_force=no version=3.4.0","X-Virus-Scanned":"amavisd-new at mnet-online.de","X-Auth-Info":"BxgvPSuCtOROxQSPLxb93JwNvds5/C1kLCUArdwCBAs=","From":"Lukasz Majewski ","To":"u-boot@lists.denx.de,\n\tStefano Babic ","Date":"Tue, 3 Sep 2019 16:38:45 +0200","Message-Id":"<20190903143850.9824-10-lukma@denx.de>","X-Mailer":"git-send-email 2.11.0","In-Reply-To":"<20190903143850.9824-1-lukma@denx.de>","References":"<20190903143850.9824-1-lukma@denx.de>","Cc":"\"NXP i.MX U-Boot Team\" ","Subject":"[U-Boot] [PATCH v2 09/14] DM: WDT: Convert WDT driver to use DM/DTS\n\t(including SYSRESET)","X-BeenThere":"u-boot@lists.denx.de","X-Mailman-Version":"2.1.18","Precedence":"list","List-Id":"U-Boot discussion ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"utf-8\"","Content-Transfer-Encoding":"base64","Errors-To":"u-boot-bounces@lists.denx.de","Sender":"\"U-Boot\" "},"content":"This commit enables support for CONFIG_WDT in the U-Boot proper. Moreover,\nthe SYSRESET_WATCHDOG driver is used to support 'reset' command.\n\nAs SPL is not yet ready for DM conversion, the CONFIG_HW_WATCHDOG is\nenabled for it. This allows the legacy SPL code to work properly.\n\nSigned-off-by: Lukasz Majewski \n---\n\nChanges in v2: None\n\n arch/arm/dts/imx6q-display5-u-boot.dtsi | 5 +++++\n configs/display5_defconfig | 3 +++\n include/configs/display5.h | 6 +++++-\n 3 files changed, 13 insertions(+), 1 deletion(-)","diff":"diff --git a/arch/arm/dts/imx6q-display5-u-boot.dtsi b/arch/arm/dts/imx6q-display5-u-boot.dtsi\nindex b942218b7ab8..aa660b5aeb65 100644\n--- a/arch/arm/dts/imx6q-display5-u-boot.dtsi\n+++ b/arch/arm/dts/imx6q-display5-u-boot.dtsi\n@@ -31,6 +31,11 @@\n \tchosen {\n \t\tstdout-path = &uart5;\n \t};\n+\n+\twdt-reboot {\n+\t\tcompatible = \"wdt-reboot\";\n+\t\twdt = <&wdog1>;\n+\t};\n };\n \n &i2c3 {\ndiff --git a/configs/display5_defconfig b/configs/display5_defconfig\nindex 3719eb40d5ea..a3062854d89c 100644\n--- a/configs/display5_defconfig\n+++ b/configs/display5_defconfig\n@@ -49,6 +49,7 @@ CONFIG_CMD_PART=y\n # CONFIG_CMD_PINMUX is not set\n CONFIG_CMD_SF=y\n CONFIG_CMD_SPI=y\n+CONFIG_CMD_WDT=y\n CONFIG_CMD_DHCP=y\n CONFIG_CMD_MII=y\n CONFIG_CMD_PING=y\n@@ -107,5 +108,7 @@ CONFIG_DM_REGULATOR_PFUZE100=y\n CONFIG_MXC_UART=y\n CONFIG_SPI=y\n CONFIG_MXC_SPI=y\n+CONFIG_SYSRESET=y\n+CONFIG_SYSRESET_WATCHDOG=y\n CONFIG_I2C_EDID=y\n CONFIG_IMX_WATCHDOG=y\ndiff --git a/include/configs/display5.h b/include/configs/display5.h\nindex a3cb62367c4c..e66bb65c21c6 100644\n--- a/include/configs/display5.h\n+++ b/include/configs/display5.h\n@@ -348,7 +348,11 @@\n \n /* Watchdog */\n #define CONFIG_WATCHDOG_TIMEOUT_MSECS 15000\n-\n+#if defined(CONFIG_SPL_BUILD)\n+#undef CONFIG_WDT\n+#undef CONFIG_WATCHDOG\n+#define CONFIG_HW_WATCHDOG\n+#endif\n /* ENV config */\n #ifdef CONFIG_ENV_IS_IN_SPI_FLASH\n #define CONFIG_ENV_SIZE\t\t(SZ_64K)\n","prefixes":["U-Boot","v2","09/14"]}