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: 2589391 Return-Path: X-Original-To: patchwork-linux-samsung-soc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id AAD45DF2E5 for ; Sat, 18 May 2013 22:37:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753318Ab3ERWhh (ORCPT ); Sat, 18 May 2013 18:37:37 -0400 Received: from mail-ee0-f41.google.com ([74.125.83.41]:53338 "EHLO mail-ee0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753460Ab3ERWhg (ORCPT ); Sat, 18 May 2013 18:37:36 -0400 Received: by mail-ee0-f41.google.com with SMTP id d4so3163679eek.14 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 Cc: linux-samsung-soc@vger.kernel.org, Kukjin Kim , Sylwester Nawrocki , =?UTF-8?q?Heiko=20St=C3=BCbner?= , Wim Van Sebroeck , linux-watchdog@vger.kernel.org, jhbird.choi@samsung.com, Tomasz Figa 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> Sender: linux-samsung-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-samsung-soc@vger.kernel.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);