From: Tomasz Figa <tomasz.figa@gmail.com>
To: linux-arm-kernel@lists.infradead.org
Cc: linux-samsung-soc@vger.kernel.org,
"Kukjin Kim" <kgene.kim@samsung.com>,
"Sylwester Nawrocki" <sylvester.nawrocki@gmail.com>,
"Heiko Stübner" <heiko@sntech.de>,
"Wim Van Sebroeck" <wim@iguana.be>,
linux-watchdog@vger.kernel.org, jhbird.choi@samsung.com,
"Tomasz Figa" <tomasz.figa@gmail.com>
Subject: [PATCH 5/6] ARM: SAMSUNG: Remove legacy watchdog reset code
Date: Sun, 19 May 2013 00:37:06 +0200 [thread overview]
Message-ID: <1368916627-23139-6-git-send-email-tomasz.figa@gmail.com> (raw)
In-Reply-To: <1368916627-23139-1-git-send-email-tomasz.figa@gmail.com>
Since all platforms have been moved to the new watchdog reset driver,
the legacy code can be removed safely.
Signed-off-by: Tomasz Figa <tomasz.figa@gmail.com>
---
.../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 <plat/clock.h>
-#include <plat/regs-watchdog.h>
-#include <mach/map.h>
-
-#include <linux/clk.h>
-#include <linux/err.h>
-#include <linux/io.h>
-#include <linux/delay.h>
-
-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);
--
1.8.2.1
next prev parent reply other threads:[~2013-05-18 22:37 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-18 22:37 [PATCH 0/6] Samsung watchdog support clean-up Tomasz Figa
2013-05-18 22:37 ` [PATCH 1/6] watchdog: s3c2410_wdt: Use local register definitions Tomasz Figa
2013-05-18 22:37 ` [PATCH 2/6] ARM: SAMSUNG: uncompress: Use local definitions of watchdog registers Tomasz Figa
2013-05-18 22:50 ` [PATCH v2 " Tomasz Figa
2013-05-18 22:37 ` [PATCH 3/6] ARM: SAMSUNG: Add watchdog reset driver Tomasz Figa
2013-05-18 22:37 ` [PATCH 4/6] ARM: SAMSUNG: Let platforms use the new " Tomasz Figa
2013-05-18 22:37 ` Tomasz Figa [this message]
2013-05-18 22:37 ` [PATCH 6/6] ARM: SAMSUNG: Remove unused plat/regs-watchdog.h header Tomasz Figa
2013-06-01 8:16 ` [PATCH 0/6] Samsung watchdog support clean-up Sylwester Nawrocki
2013-06-03 12:49 ` Tomasz Figa
2013-06-04 9:37 ` Kukjin Kim
2013-06-04 9:45 ` Tomasz Figa
2013-06-10 10:00 ` Kukjin Kim
2013-06-13 19:11 ` Tomasz Figa
2013-06-13 23:22 ` Kukjin Kim
2013-06-13 23:25 ` Tomasz Figa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1368916627-23139-6-git-send-email-tomasz.figa@gmail.com \
--to=tomasz.figa@gmail.com \
--cc=heiko@sntech.de \
--cc=jhbird.choi@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=sylvester.nawrocki@gmail.com \
--cc=wim@iguana.be \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).