From: slemieux.tyco@gmail.com
To: linux-arm-kernel@lists.infradead.org, wim@iguana.be, manabian@gmail.com
Cc: linux-watchdog@vger.kernel.org, linux@roeck-us.net,
stigge@antcom.de, vz@mleia.com
Subject: [PATCH v2 5/5] arm: lpc32xx: remove restart handler
Date: Mon, 22 Feb 2016 11:55:43 -0500 [thread overview]
Message-ID: <1456160143-26761-6-git-send-email-slemieux.tyco@gmail.com> (raw)
In-Reply-To: <1456160143-26761-1-git-send-email-slemieux.tyco@gmail.com>
From: Sylvain Lemieux <slemieux@tycoint.com>
Remove the restart handler from "mach-lpc32xx";
this functionality is now available in the
pnx4008 watchdog driver.
Signed-off-by: Sylvain Lemieux <slemieux@tycoint.com>
---
Changes from v1 to v2:
- new patch in v2.
arch/arm/mach-lpc32xx/common.c | 15 ---------------
arch/arm/mach-lpc32xx/common.h | 1 -
arch/arm/mach-lpc32xx/phy3250.c | 1 -
3 files changed, 17 deletions(-)
diff --git a/arch/arm/mach-lpc32xx/common.c b/arch/arm/mach-lpc32xx/common.c
index 716e83e..5b7a1e7 100644
--- a/arch/arm/mach-lpc32xx/common.c
+++ b/arch/arm/mach-lpc32xx/common.c
@@ -194,21 +194,6 @@ void __init lpc32xx_map_io(void)
iotable_init(lpc32xx_io_desc, ARRAY_SIZE(lpc32xx_io_desc));
}
-void lpc23xx_restart(enum reboot_mode mode, const char *cmd)
-{
- /* Make sure WDT clocks are enabled */
- __raw_writel(LPC32XX_CLKPWR_PWMCLK_WDOG_EN,
- LPC32XX_CLKPWR_TIMER_CLK_CTRL);
-
- /* Instant assert of RESETOUT_N with pulse length 1mS */
- __raw_writel(13000, io_p2v(LPC32XX_WDTIM_BASE + 0x18));
- __raw_writel(0x70, io_p2v(LPC32XX_WDTIM_BASE + 0xC));
-
- /* Wait for watchdog to reset system */
- while (1)
- ;
-}
-
static int __init lpc32xx_check_uid(void)
{
u32 uid[4];
diff --git a/arch/arm/mach-lpc32xx/common.h b/arch/arm/mach-lpc32xx/common.h
index 1cd8853..2d90801 100644
--- a/arch/arm/mach-lpc32xx/common.h
+++ b/arch/arm/mach-lpc32xx/common.h
@@ -30,7 +30,6 @@ extern void lpc32xx_timer_init(void);
extern void __init lpc32xx_init_irq(void);
extern void __init lpc32xx_map_io(void);
extern void __init lpc32xx_serial_init(void);
-extern void lpc23xx_restart(enum reboot_mode, const char *);
/*
diff --git a/arch/arm/mach-lpc32xx/phy3250.c b/arch/arm/mach-lpc32xx/phy3250.c
index 77d6b1b..942bc3f 100644
--- a/arch/arm/mach-lpc32xx/phy3250.c
+++ b/arch/arm/mach-lpc32xx/phy3250.c
@@ -263,5 +263,4 @@ DT_MACHINE_START(LPC32XX_DT, "LPC32XX SoC (Flattened Device Tree)")
.init_time = lpc32xx_timer_init,
.init_machine = lpc3250_machine_init,
.dt_compat = lpc32xx_dt_compat,
- .restart = lpc23xx_restart,
MACHINE_END
--
1.8.3.1
prev parent reply other threads:[~2016-02-22 16:55 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 16:55 [PATCH v2 0/5] watchdog: pnx4008: add restart handler slemieux.tyco
2016-02-22 16:55 ` [PATCH v2 1/5] watchdog: pnx4008: update logging during power-on slemieux.tyco
2016-02-22 16:55 ` [PATCH v2 2/5] watchdog: pnx4008: add restart handler slemieux.tyco
2016-02-22 18:03 ` Joachim Eastwood
2016-02-22 18:25 ` Sylvain Lemieux
2016-02-22 16:55 ` [PATCH v2 3/5] watchdog: pnx4008: add support for soft reset slemieux.tyco
2016-02-22 16:55 ` [PATCH v2 4/5] watchdog: pnx4008: restart: support "cmd" from userspace slemieux.tyco
2016-02-22 16:55 ` slemieux.tyco [this message]
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=1456160143-26761-6-git-send-email-slemieux.tyco@gmail.com \
--to=slemieux.tyco@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-watchdog@vger.kernel.org \
--cc=linux@roeck-us.net \
--cc=manabian@gmail.com \
--cc=stigge@antcom.de \
--cc=vz@mleia.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).