From patchwork Mon Jul 6 17:59:39 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Francesco Lavra X-Patchwork-Id: 6727051 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 06598C05AC for ; Mon, 6 Jul 2015 18:03:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 34C0F20525 for ; Mon, 6 Jul 2015 18:03:10 +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 696B7204DE for ; Mon, 6 Jul 2015 18:03:09 +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 1ZCAgb-0001Q7-1K; Mon, 06 Jul 2015 18:00:09 +0000 Received: from mail-wi0-x233.google.com ([2a00:1450:400c:c05::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1ZCAgX-0000At-35 for linux-arm-kernel@lists.infradead.org; Mon, 06 Jul 2015 18:00:06 +0000 Received: by wibdq8 with SMTP id dq8so160884279wib.1 for ; Mon, 06 Jul 2015 10:59:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject :content-type:content-transfer-encoding; bh=vhI+OyCB3th4kmTYavfzHasylYk9vHLEcWrAltgXcKs=; b=jn4/7AwMeWaTGuHh4EQnYpt+Y3GZaSvx6tWe9YOairMHrG+6Wq8FOF9JEDNkxMy3ls nUVjxZ7wB6l9/xM03c0VegwDI3gvzvt76E5fKL48RzvmACZLiAXEubX9PJbfSNS+Nz62 6YgkitU0XBBkJYrwmiGf/rVNlAdv8O8C7gUy3g+h+4+rW1XW16alxp/vr4oez8qaHWRD pZjnME7uTeLarF7gDL5KguqV5VBpdccc9fIW622yspa4Dp3exmxPgXvrj8Bbn2gsKViU t2IibT2zQ1UXMC0AlJYrWfGD0bt6IhQi+o1kHUrtWgLDt3KAYg9MTVfxOuRPZvM2r+lL mQoA== X-Received: by 10.180.218.195 with SMTP id pi3mr55647307wic.71.1436205582738; Mon, 06 Jul 2015 10:59:42 -0700 (PDT) Received: from [192.168.1.64] ([2.227.237.103]) by mx.google.com with ESMTPSA id l7sm29815950wic.2.2015.07.06.10.59.40 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 10:59:41 -0700 (PDT) Message-ID: <559AC20B.4090601@gmail.com> Date: Mon, 06 Jul 2015 19:59:39 +0200 From: Francesco Lavra User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: wim@iguana.be, maxime.ripard@free-electrons.com, linux-watchdog@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Subject: [PATCH] watchdog: sunxi: fix activation of system reset X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150706_110005_292884_31548E55 X-CRM114-Status: GOOD ( 13.81 ) X-Spam-Score: -2.7 (--) 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: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, 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 Commit f2147de3 ("watchdog: sunxi: support parameterized compatible strings") introduced a regression in sunxi_wdt_start(), by which the system reset function of the watchdog is not enabled upon starting the watchdog. Fix it. Signed-off-by: Francesco Lavra Reviewed-by: Guenter Roeck --- drivers/watchdog/sunxi_wdt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/watchdog/sunxi_wdt.c b/drivers/watchdog/sunxi_wdt.c index a29afb3..47bd8a1 100644 --- a/drivers/watchdog/sunxi_wdt.c +++ b/drivers/watchdog/sunxi_wdt.c @@ -184,7 +184,7 @@ static int sunxi_wdt_start(struct watchdog_device *wdt_dev) /* Set system reset function */ reg = readl(wdt_base + regs->wdt_cfg); reg &= ~(regs->wdt_reset_mask); - reg |= ~(regs->wdt_reset_val); + reg |= regs->wdt_reset_val; writel(reg, wdt_base + regs->wdt_cfg); /* Enable watchdog */