From patchwork Sat May 18 22:37:06 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Figa X-Patchwork-Id: 2589451 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id 4DAC0DF2E5 for ; Sat, 18 May 2013 22:39:57 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UdpmD-0007BX-0I; Sat, 18 May 2013 22:38:58 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Udpls-0005CF-LF; Sat, 18 May 2013 22:38:36 +0000 Received: from mail-ea0-x236.google.com ([2a00:1450:4013:c01::236]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UdplF-00057u-0i for linux-arm-kernel@lists.infradead.org; Sat, 18 May 2013 22:37:58 +0000 Received: by mail-ea0-f182.google.com with SMTP id r16so3317513ead.13 for ; Sat, 18 May 2013 15:37:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=MhEMD8oBlD+KRMXyej2g0NMYcMRLigMGjgJczo1iLXQ=; b=PHCGa9qxQxBK1EyzKIBx7lQPXQslP9V1qmXsOUQSb/hdFlvr7HC3QqlPAwp6j3YDAf yWlnbaHVO3gaRMrjI1rMpwGPuddYTXkPagHI4e8ojU+KqiHyjmkAxKmWtI3sijk2qm3T FUItzWNH/6bEcwnI5GuZ/De+ZGK/MOOc3XxUPfiGEUJf4ao5ODkC6b6CjrhzN+ajj28S niGD2e8kkiu7jZZtQurnSfqU56dwWcdl6vA60gMcW3WkntPpjMVeTBKJDSpMiydsJBlV YccV312cPIVRx3wrIPYyUSN1OZ1k94GrHYlfUqSngkZiPHhioWSicLFROUpeUIR/vuw5 hD+A== X-Received: by 10.15.24.72 with SMTP id i48mr126127288eeu.37.1368916655262; Sat, 18 May 2013 15:37:35 -0700 (PDT) Received: from flatron.tomeq (87-207-52-162.dynamic.chello.pl. [87.207.52.162]) by mx.google.com with ESMTPSA id i3sm28210104eev.1.2013.05.18.15.37.33 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Sat, 18 May 2013 15:37:34 -0700 (PDT) From: Tomasz Figa To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 5/6] ARM: SAMSUNG: Remove legacy watchdog reset code Date: Sun, 19 May 2013 00:37:06 +0200 Message-Id: <1368916627-23139-6-git-send-email-tomasz.figa@gmail.com> X-Mailer: git-send-email 1.8.2.1 In-Reply-To: <1368916627-23139-1-git-send-email-tomasz.figa@gmail.com> References: <1368916627-23139-1-git-send-email-tomasz.figa@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130518_183757_256623_F5AD16E2 X-CRM114-Status: GOOD ( 10.26 ) X-Spam-Score: -2.0 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider (tomasz.figa[at]gmail.com) -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Cc: Kukjin Kim , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Tomasz Figa , Wim Van Sebroeck , linux-samsung-soc@vger.kernel.org, Sylwester Nawrocki , jhbird.choi@samsung.com, linux-watchdog@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Since all platforms have been moved to the new watchdog reset driver, the legacy code can be removed safely. Signed-off-by: Tomasz Figa --- .../arm/plat-samsung/include/plat/watchdog-reset.h | 35 ---------------------- 1 file changed, 35 deletions(-) diff --git a/arch/arm/plat-samsung/include/plat/watchdog-reset.h b/arch/arm/plat-samsung/include/plat/watchdog-reset.h index 4def1b2..f2dc304 100644 --- a/arch/arm/plat-samsung/include/plat/watchdog-reset.h +++ b/arch/arm/plat-samsung/include/plat/watchdog-reset.h @@ -13,41 +13,6 @@ #ifndef __PLAT_WATCHDOG_RESET_H #define __PLAT_WATCHDOG_RESET_H -#include -#include -#include - -#include -#include -#include -#include - -static inline void arch_wdt_reset(void) -{ - printk("arch_reset: attempting watchdog reset\n"); - - __raw_writel(0, S3C2410_WTCON); /* disable watchdog, to be safe */ - - if (!IS_ERR(s3c2410_wdtclk)) - clk_enable(s3c2410_wdtclk); - - /* put initial values into count and data */ - __raw_writel(0x80, S3C2410_WTCNT); - __raw_writel(0x80, S3C2410_WTDAT); - - /* set the watchdog to go and reset... */ - __raw_writel(S3C2410_WTCON_ENABLE|S3C2410_WTCON_DIV16|S3C2410_WTCON_RSTEN | - S3C2410_WTCON_PRESCALE(0x20), S3C2410_WTCON); - - /* wait for reset to assert... */ - mdelay(500); - - printk(KERN_ERR "Watchdog reset failed to assert reset\n"); - - /* delay to allow the serial port to show the message */ - mdelay(50); -} - extern void samsung_wdt_reset(void); extern void samsung_wdt_reset_of_init(void); extern void samsung_wdt_reset_init(void __iomem *base);