From patchwork Thu Feb 25 18:31:37 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8425811 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id E827AC0553 for ; Thu, 25 Feb 2016 18:34:49 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id E5CEB202B8 for ; Thu, 25 Feb 2016 18:34:48 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E255201BC for ; Thu, 25 Feb 2016 18:34:48 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZ0iw-00017G-CA; Thu, 25 Feb 2016 18:33:14 +0000 Received: from mail-io0-x241.google.com ([2607:f8b0:4001:c06::241]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aZ0i2-0000Ut-6O for linux-arm-kernel@lists.infradead.org; Thu, 25 Feb 2016 18:32:20 +0000 Received: by mail-io0-x241.google.com with SMTP id b188so6393570iof.3 for ; Thu, 25 Feb 2016 10:31:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=gQarKNacOYQatq4q3vYzjn4k5qFN+8eo2O5XPrfV+js=; b=sEm/JwiqyxTd3se9g3jdFryKlzeRZpGKobnli9QnwwSDsPE/AluX+vjsjRdC9ZoJXF hB0h4LnDgNxsXQIZ2R/B6AbO232dYSvWCu7VPMFW1+qYSFOwlTA8A0yBEsWo9s3lUczO cevEaCUdcIcpvKTvYPpfL5N3+u7XN7SRI2T2LwbDz7mQ6VgGGS4dsOZJZLqFA13yUrqt DKvgVCkjE+F5JTRRAoQgimykfU97agBx0IduprRLLvvpGG6/8Mp5eVGlSWQ57fWB1S3L ltv31+LI83nC40eUt6kBcgzflCBy1hMiICB63beeeekQbn1HJe/69udzU8g01A+Jk4F/ N6gw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=gQarKNacOYQatq4q3vYzjn4k5qFN+8eo2O5XPrfV+js=; b=FH74nUHIoa3tbVHdxHH21d8hSk6/lcoSRPFRKvnXLAs6fiqX5VicNlsLqLhoAdT62V T2nPV1Wbt4577SYmhZptRgNlO7dP422aCLNE2En4bC2ei19ZmSQ6jHGvTlXG9uDzxfVP aQUaKjUvhqcoGlUIdPteH2vLAzMXfhp+zDWoR6MiFMAd9JmtH9tPlgUbRuBmizpducDi A2sq32hu0xrTfNp0TE2dq6ROCLGMSmQ3UdpAyaoi3ieo7Gx+jJmIo9r6LGKvEv4iSemV U5vrPfUsl7yKvaxsQZwvnFCs+6KYhIXG0xPE17YlPvWLk0W0iNuEyD3drwbzPc/gjFB/ LpHA== X-Gm-Message-State: AG10YOTjG2AayAodqPdN2VY7MaRGXrxYEry/tnkhOb1os34Mj0tvSd6Y7zn/MYLfBqurfQ== X-Received: by 10.107.168.29 with SMTP id r29mr4680625ioe.12.1456425117362; Thu, 25 Feb 2016 10:31:57 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id qa4sm1736299igb.14.2016.02.25.10.31.55 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 25 Feb 2016 10:31:55 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, wim@iguana.be, manabian@gmail.com Subject: [PATCH v4 3/6] watchdog: pnx4008: add support for soft reset Date: Thu, 25 Feb 2016 13:31:37 -0500 Message-Id: <1456425100-28136-4-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456425100-28136-1-git-send-email-slemieux.tyco@gmail.com> References: <1456425100-28136-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160225_103218_605708_06BC4511 X-CRM114-Status: GOOD ( 14.25 ) X-Spam-Score: -1.2 (-) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stigge@antcom.de, linux-watchdog@vger.kernel.org, linux@roeck-us.net, vz@mleia.com MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.0 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_SORBS_WEB, UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Sylvain Lemieux Add support for explicit soft reset using the reboot mode. The default reboot mode behavior is unchanged; you can overwrite the default reboot type in the board specific file "DT_MACHINE_START" definition using the "reboot_mode" parameter. Signed-off-by: Sylvain Lemieux --- Changes from v3 to v4: - none. Changes from v2 to v3: - no logical change; updated to work with new revision of patch #2. Changes from v1 to v2: - Rename patch title; was "arm: lpc32xx: restart: add support for soft reset" - Add change to "pnx-4008" driver instead of "mach-lpc32xx". - Use define available in "pnx-4008" when writting to watchdog register. drivers/watchdog/pnx4008_wdt.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/drivers/watchdog/pnx4008_wdt.c b/drivers/watchdog/pnx4008_wdt.c index 80ee4af..fbf027e 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -130,9 +130,16 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd, static int pnx4008_restart_handler(struct notifier_block *this, unsigned long mode, void *cmd) { - /* Instant assert of RESETOUT_N with pulse length 1mS */ - writel(13000, WDTIM_PULSE(wdt_base)); - writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base)); + if (mode == (unsigned long)REBOOT_SOFT) { + /* Force match output active */ + writel(EXT_MATCH0, WDTIM_EMR(wdt_base)); + /* Internal reset on match output (RESOUT_N not asserted) */ + writel(M_RES1, WDTIM_MCTRL(wdt_base)); + } else { + /* Instant assert of RESETOUT_N with pulse length 1mS */ + writel(13000, WDTIM_PULSE(wdt_base)); + writel(M_RES2 | RESFRC1 | RESFRC2, WDTIM_MCTRL(wdt_base)); + } /* Wait for watchdog to reset system */ mdelay(1000);