From patchwork Mon Feb 29 17:31:05 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sylvain Lemieux X-Patchwork-Id: 8456641 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 40DB8C0553 for ; Mon, 29 Feb 2016 17:35:52 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 329F220212 for ; Mon, 29 Feb 2016 17:35:51 +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 62CF42017D for ; Mon, 29 Feb 2016 17:35:50 +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 1aaRi4-00054J-6v; Mon, 29 Feb 2016 17:34:16 +0000 Received: from mail-io0-x244.google.com ([2607:f8b0:4001:c06::244]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1aaRff-0002rV-E2 for linux-arm-kernel@lists.infradead.org; Mon, 29 Feb 2016 17:31:49 +0000 Received: by mail-io0-x244.google.com with SMTP id b188so14415009iof.3 for ; Mon, 29 Feb 2016 09:31:26 -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=E91Dpc9bgyD6SkhaZ5qvXtzqEXS124YG7xZAlF8qmdk=; b=M/9jpzmXKahjhQl+IOVVoMjq//7Sq2rWOcsj598mIEnM1S6QFjSuDBTk8HfmCyrD6i 7DAZE+HkZbdpZaaH3e/bDkKuwy6q1Teejna1m1vhVVn3m8vUBF/xqSM0Fc5Wc7/aRdIQ 8V5qNIfe+OidWhC2jsfBgYwUwBQH9T6O4QHFLFWypp5puzBMzZiQheQmBQoYwLFWqr5s XcJqiQMGs+Jo2+CpfPSt+D47gUb4NqTd+lfwAehNdwJRdNhd7vd6W8/eTibep3UiFpr/ HTvbJXCK0JUK4Y9cNUkfc7jM3i2yr+hLWQ3GQLcwf8+I7LwcvppOfI8cInXfcxxndEDr expw== 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=E91Dpc9bgyD6SkhaZ5qvXtzqEXS124YG7xZAlF8qmdk=; b=eBCIfUUMNtS1B09PzRy+DN2rXKgor77OrLZ81bCOctVYH8OxiZ0s8DklYKzekh62VJ 8ZjqCr8P4gMzbUpVb3czunpSedXw5yqqNwkjHRuLhN7IvQKECaMDSsoWpB/7CvcVQ535 Ac9Uu45JJQ9DYwebGGSAUG8RMugRVC0oL6Dx5bucLN5BI/lCbljGZOltLCg08lcnDLrd Dfs2Csz2hCsz6xRMWxlqa7S6rtcQIZUt5MFLiSw++AEKCXtD79Kxg9GTWboyh1moMAbM EB5dUSifqe13R7EhMhXo8UW84svIxKoYhtOo42xvo+ZmRe9V4zj7EiFn0fuzgbYgjujL /prg== X-Gm-Message-State: AG10YOTJxlNA0OgHhx2SOY9Vk+3okOoUggCFPcJz4hJeT/gTG3VY8mtlDdRp6jo5ROra7w== X-Received: by 10.107.3.160 with SMTP id e32mr23053720ioi.124.1456767086225; Mon, 29 Feb 2016 09:31:26 -0800 (PST) Received: from CABRO3AP00510.americas.tsp.ad ([74.51.240.241]) by smtp.gmail.com with ESMTPSA id wi7sm2414748igb.1.2016.02.29.09.31.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Feb 2016 09:31:25 -0800 (PST) From: Sylvain Lemieux To: linux-arm-kernel@lists.infradead.org, arnd@arndb.de, linux@roeck-us.net, manabian@gmail.com Subject: [PATCH v5 3/6] watchdog: pnx4008: add support for soft reset Date: Mon, 29 Feb 2016 12:31:05 -0500 Message-Id: <1456767068-14449-4-git-send-email-slemieux.tyco@gmail.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1456767068-14449-1-git-send-email-slemieux.tyco@gmail.com> References: <1456767068-14449-1-git-send-email-slemieux.tyco@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160229_093147_713761_48F4061F X-CRM114-Status: GOOD ( 14.18 ) X-Spam-Score: -1.9 (-) 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, wim@iguana.be, linux-watchdog@vger.kernel.org, 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=-3.3 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, RP_MATCHES_RCVD, T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=ham 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 v4 to v5: - no logical change; updated to work with new revision of patch #2. 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 f3be522..e05bfecf 100644 --- a/drivers/watchdog/pnx4008_wdt.c +++ b/drivers/watchdog/pnx4008_wdt.c @@ -129,9 +129,16 @@ static int pnx4008_wdt_set_timeout(struct watchdog_device *wdd, static int pnx4008_restart_handler(struct watchdog_device *wdd, 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);