From: linux@arm•linux.org.uk (Russell King - ARM Linux)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH 15/41] ARM: restart: iop13xx: use new restart hook
Date: Sun, 06 Nov 2011 17:45:02 +0000 [thread overview]
Message-ID: <E1RN6mE-0001XZ-RX@rmk-PC.arm.linux.org.uk> (raw)
In-Reply-To: <20111106173113.GI12913@n2100.arm.linux.org.uk>
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Signed-off-by: Russell King <rmk+kernel@arm•linux.org.uk>
---
arch/arm/mach-iop13xx/include/mach/iop13xx.h | 1 +
arch/arm/mach-iop13xx/include/mach/system.h | 10 ----------
arch/arm/mach-iop13xx/iq81340mc.c | 1 +
arch/arm/mach-iop13xx/iq81340sc.c | 1 +
arch/arm/mach-iop13xx/setup.c | 11 +++++++++++
5 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-iop13xx/include/mach/iop13xx.h b/arch/arm/mach-iop13xx/include/mach/iop13xx.h
index 52b7fab..07e9ff7 100644
--- a/arch/arm/mach-iop13xx/include/mach/iop13xx.h
+++ b/arch/arm/mach-iop13xx/include/mach/iop13xx.h
@@ -10,6 +10,7 @@ void iop13xx_map_io(void);
void iop13xx_platform_init(void);
void iop13xx_add_tpmi_devices(void);
void iop13xx_init_irq(void);
+void iop13xx_restart(char, const char *);
/* CPUID CP6 R0 Page 0 */
static inline int iop13xx_cpu_id(void)
diff --git a/arch/arm/mach-iop13xx/include/mach/system.h b/arch/arm/mach-iop13xx/include/mach/system.h
index d0c66ef..7f798dc 100644
--- a/arch/arm/mach-iop13xx/include/mach/system.h
+++ b/arch/arm/mach-iop13xx/include/mach/system.h
@@ -7,7 +7,6 @@
* it under the terms of the GNU General Public License version 2 as
* published by the Free Software Foundation.
*/
-#include <mach/iop13xx.h>
static inline void arch_idle(void)
{
cpu_do_idle();
@@ -15,13 +14,4 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
- /*
- * Reset the internal bus (warning both cores are reset)
- */
- write_wdtcr(IOP_WDTCR_EN_ARM);
- write_wdtcr(IOP_WDTCR_EN);
- write_wdtsr(IOP13XX_WDTSR_WRITE_EN | IOP13XX_WDTCR_IB_RESET);
- write_wdtcr(0x1000);
-
- for(;;);
}
diff --git a/arch/arm/mach-iop13xx/iq81340mc.c b/arch/arm/mach-iop13xx/iq81340mc.c
index 4cf2cc4..abaee88 100644
--- a/arch/arm/mach-iop13xx/iq81340mc.c
+++ b/arch/arm/mach-iop13xx/iq81340mc.c
@@ -96,4 +96,5 @@ MACHINE_START(IQ81340MC, "Intel IQ81340MC")
.init_irq = iop13xx_init_irq,
.timer = &iq81340mc_timer,
.init_machine = iq81340mc_init,
+ .restart = iop13xx_restart,
MACHINE_END
diff --git a/arch/arm/mach-iop13xx/iq81340sc.c b/arch/arm/mach-iop13xx/iq81340sc.c
index cd9e274..690916a 100644
--- a/arch/arm/mach-iop13xx/iq81340sc.c
+++ b/arch/arm/mach-iop13xx/iq81340sc.c
@@ -98,4 +98,5 @@ MACHINE_START(IQ81340SC, "Intel IQ81340SC")
.init_irq = iop13xx_init_irq,
.timer = &iq81340sc_timer,
.init_machine = iq81340sc_init,
+ .restart = iop13xx_restart,
MACHINE_END
diff --git a/arch/arm/mach-iop13xx/setup.c b/arch/arm/mach-iop13xx/setup.c
index a5b9897..daabb1f 100644
--- a/arch/arm/mach-iop13xx/setup.c
+++ b/arch/arm/mach-iop13xx/setup.c
@@ -606,3 +606,14 @@ static int __init iop13xx_init_adma_setup(char *str)
__setup("iop13xx_init_adma", iop13xx_init_adma_setup);
__setup("iop13xx_init_uart", iop13xx_init_uart_setup);
__setup("iop13xx_init_i2c", iop13xx_init_i2c_setup);
+
+void iop13xx_restart(char mode, const char *cmd)
+{
+ /*
+ * Reset the internal bus (warning both cores are reset)
+ */
+ write_wdtcr(IOP_WDTCR_EN_ARM);
+ write_wdtcr(IOP_WDTCR_EN);
+ write_wdtsr(IOP13XX_WDTSR_WRITE_EN | IOP13XX_WDTCR_IB_RESET);
+ write_wdtcr(0x1000);
+}
--
1.7.4.4
next prev parent reply other threads:[~2011-11-06 17:45 UTC|newest]
Thread overview: 152+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-11-06 17:31 [01: PATCH 0/7] Preparation for arch_reset changes Russell King - ARM Linux
2011-11-06 17:31 ` [PATCH 1/7] ARM: restart: add restart hook to machine_desc record Russell King - ARM Linux
2011-11-09 22:28 ` Tony Lindgren
2011-11-11 19:10 ` Linus Walleij
2011-11-06 17:32 ` [PATCH 2/7] ARM: restart: allow platforms more flexibility specifying restart mode Russell King - ARM Linux
2011-11-06 17:32 ` [PATCH 3/7] ARM: restart: add default restart modes for PXA mioa701, spitz and tosa Russell King - ARM Linux
2011-11-07 18:02 ` Robert Jarzmik
2011-11-06 17:32 ` [PATCH 4/7] ARM: restart: move reboot failure handing into machine_restart() Russell King - ARM Linux
2011-11-09 22:29 ` Tony Lindgren
2011-11-06 17:33 ` [PATCH 5/7] ARM: restart: remove argument to setup_mm_for_reboot() Russell King - ARM Linux
2011-11-09 22:30 ` Tony Lindgren
2011-11-06 17:33 ` [PATCH 6/7] ARM: restart: only perform setup for restart when soft-restarting Russell King - ARM Linux
2011-11-17 17:42 ` Russell King - ARM Linux
2011-11-17 18:00 ` Sascha Hauer
2011-11-18 3:29 ` Viresh Kumar
2011-11-18 7:51 ` Krzysztof Halasa
2011-11-18 7:56 ` Paul Mundt
2011-11-18 10:13 ` Richard Purdie
2011-11-24 6:47 ` Lennert Buytenhek
2011-12-03 9:23 ` Kukjin Kim
2011-12-03 9:30 ` Russell King - ARM Linux
2011-12-03 9:45 ` Kukjin Kim
2011-11-18 3:43 ` Wan ZongShun
2011-11-21 3:42 ` Eric Miao
2011-11-06 17:33 ` [PATCH 7/7] ARM: restart: remove local_irq_disable() from within arch_reset() Russell King - ARM Linux
2011-11-06 17:39 ` [02: PATCH 0/41] Platform arch_reset changes Russell King - ARM Linux
2011-11-06 17:54 ` [03: PATCH 0/5] The remaining stuff Russell King - ARM Linux
2011-11-06 17:55 ` [PATCH 1/5] XXX: tcc8k Russell King - ARM Linux
2011-11-06 17:55 ` [PATCH 2/5] ARM: restart: omap: use new restart hook XXX WIP XXX Russell King - ARM Linux
2011-11-09 22:27 ` Tony Lindgren
2011-11-10 22:32 ` Russell King - ARM Linux
2011-11-06 17:56 ` [PATCH 3/5] ARM: restart: exynos4: use new restart hook XXX WIP XXX WHY IS THERE NO LOCAL HEADERS IN arch/arm/mach-exynos4 XXX Russell King - ARM Linux
2011-11-07 10:30 ` Russell King - ARM Linux
2011-11-07 11:17 ` Kyungmin Park
2011-11-07 11:52 ` Russell King - ARM Linux
2011-11-08 5:21 ` Kukjin Kim
2011-11-10 23:15 ` Russell King - ARM Linux
2011-11-15 7:47 ` Kukjin Kim
2011-11-06 17:56 ` [PATCH 4/5] ARM: restart: s5pv210: " Russell King - ARM Linux
2011-11-08 5:23 ` Kukjin Kim
2011-11-08 10:04 ` Russell King - ARM Linux
2011-11-06 17:56 ` [PATCH 5/5] ARM: restart: plat-samsung: remove plat/reset.h and s5p_reset_hook Russell King - ARM Linux
2011-11-08 5:22 ` Kukjin Kim
2011-11-08 7:00 ` [03: PATCH 0/5] The remaining stuff Kukjin Kim
2011-11-08 9:00 ` Russell King - ARM Linux
2011-11-09 5:06 ` Kukjin Kim
2011-11-11 17:16 ` Russell King - ARM Linux
2011-11-14 19:01 ` Nori, Sekhar
2011-11-28 10:40 ` Linus Walleij
2011-11-28 11:07 ` Russell King - ARM Linux
2011-11-28 11:23 ` Linus Walleij
2011-11-07 13:38 ` [02: PATCH 0/41] Platform arch_reset changes Will Deacon
2011-11-07 13:52 ` Russell King - ARM Linux
2011-11-08 4:24 ` Nicolas Pitre
2011-11-06 17:40 ` [PATCH 01/41] ARM: clps711x: consolidate irq/mm/time code into a single file Russell King - ARM Linux
2011-11-06 17:40 ` [PATCH 02/41] ARM: restart: remove poodle restart handler Russell King - ARM Linux
2011-11-17 17:24 ` Russell King - ARM Linux
2011-11-18 10:11 ` Richard Purdie
2011-11-06 17:40 ` [PATCH 03/41] ARM: restart: remove s3c24xx " Russell King - ARM Linux
2011-11-08 5:00 ` Kukjin Kim
2011-11-06 17:41 ` [PATCH 04/41] ARM: restart: at91: use new restart hook Russell King - ARM Linux
2011-11-15 1:16 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-15 8:52 ` Russell King - ARM Linux
2011-11-15 9:15 ` Jean-Christophe PLAGNIOL-VILLARD
2011-11-06 17:41 ` [PATCH 05/41] ARM: restart: clps711x: " Russell King - ARM Linux
2011-11-06 17:41 ` [PATCH 06/41] ARM: restart: cns3xxx: " Russell King - ARM Linux
2011-11-24 20:30 ` Russell King - ARM Linux
2011-11-24 21:00 ` Anton Vorontsov
2011-11-06 17:42 ` [PATCH 07/41] ARM: restart: dove: " Russell King - ARM Linux
2011-11-24 22:07 ` Nicolas Pitre
2011-11-06 17:42 ` [PATCH 08/41] ARM: restart: ebsa110: " Russell King - ARM Linux
2011-11-06 17:43 ` [PATCH 09/41] ARM: restart: ep93xx: " Russell King - ARM Linux
2011-11-07 17:10 ` H Hartley Sweeten
2011-11-06 17:43 ` [PATCH 10/41] ARM: restart: footbridge: " Russell King - ARM Linux
2011-11-06 17:43 ` [PATCH 11/41] ARM: restart: h720x: " Russell King - ARM Linux
2011-11-06 17:44 ` [PATCH 12/41] ARM: restart: highbank: " Russell King - ARM Linux
2011-11-07 15:43 ` Rob Herring
2011-11-06 17:44 ` [PATCH 13/41] ARM: restart: integrator: " Russell King - ARM Linux
2011-11-25 21:41 ` Linus Walleij
2011-11-06 17:44 ` [PATCH 14/41] ARM: restart: iop3xx: " Russell King - ARM Linux
2011-11-17 17:28 ` Russell King - ARM Linux
2011-11-24 6:45 ` Lennert Buytenhek
2011-11-06 17:45 ` Russell King - ARM Linux [this message]
2011-11-17 17:29 ` [PATCH 15/41] ARM: restart: iop13xx: " Russell King - ARM Linux
2011-11-24 6:45 ` Lennert Buytenhek
2011-11-06 17:45 ` [PATCH 16/41] ARM: restart: ixp2000: " Russell King - ARM Linux
2011-11-17 17:29 ` Russell King - ARM Linux
2011-11-24 6:45 ` Lennert Buytenhek
2011-11-06 17:45 ` [PATCH 17/41] ARM: restart: ixp23xx: " Russell King - ARM Linux
2011-11-17 17:30 ` Russell King - ARM Linux
2011-11-24 6:46 ` Lennert Buytenhek
2011-11-06 17:46 ` [PATCH 18/41] ARM: restart: ixp4xx: " Russell King - ARM Linux
2011-11-17 17:30 ` Russell King - ARM Linux
2011-11-18 7:49 ` Krzysztof Halasa
2011-11-18 19:46 ` Russell King - ARM Linux
2011-11-18 22:11 ` Krzysztof Halasa
2011-11-06 17:46 ` [PATCH 19/41] ARM: restart: kirkwood: " Russell King - ARM Linux
2011-11-07 2:58 ` Nicolas Pitre
2011-11-06 17:46 ` [PATCH 20/41] ARM: restart: lpc32xx: " Russell King - ARM Linux
2011-11-06 17:47 ` [PATCH 21/41] ARM: restart: mmp: " Russell King - ARM Linux
2011-11-06 17:47 ` [PATCH 22/41] ARM: restart: mv78xx0: " Russell King - ARM Linux
2011-11-24 22:02 ` Nicolas Pitre
2011-11-06 17:47 ` [PATCH 23/41] ARM: restart: mxc: " Russell King - ARM Linux
2011-11-24 20:31 ` Russell King - ARM Linux
2011-11-25 12:06 ` Sascha Hauer
2011-11-06 17:48 ` [PATCH 24/41] ARM: restart: mxs: " Russell King - ARM Linux
2011-11-11 4:02 ` Shawn Guo
2011-11-06 17:48 ` [PATCH 25/41] ARM: restart: orion5x: " Russell King - ARM Linux
2011-11-24 22:05 ` Nicolas Pitre
2011-11-06 17:48 ` [PATCH 26/41] ARM: restart: pnx4008: " Russell King - ARM Linux
2011-11-06 17:49 ` [PATCH 27/41] ARM: restart: prima2: " Russell King - ARM Linux
2011-11-07 8:15 ` Barry Song
2011-11-06 17:49 ` [PATCH 28/41] ARM: restart: pxa: " Russell King - ARM Linux
2011-11-17 17:27 ` Russell King - ARM Linux
2011-11-18 10:11 ` Richard Purdie
2011-11-06 17:49 ` [PATCH 29/41] ARM: restart: realview: " Russell King - ARM Linux
2011-11-06 17:50 ` [PATCH 30/41] ARM: restart: riscpc: " Russell King - ARM Linux
2011-11-06 17:50 ` [PATCH 31/41] ARM: restart: sa1100: " Russell King - ARM Linux
2011-11-06 17:50 ` [PATCH 32/41] ARM: restart: shark: " Russell King - ARM Linux
2011-11-06 17:51 ` [PATCH 33/41] ARM: restart: spear: " Russell King - ARM Linux
2011-11-24 20:32 ` Russell King - ARM Linux
2011-11-25 3:35 ` Viresh Kumar
2011-11-06 17:51 ` [PATCH 34/41] ARM: restart: tegra: " Russell King - ARM Linux
2011-11-06 17:51 ` [PATCH 35/41] ARM: restart: u300: " Russell King - ARM Linux
2011-11-07 8:10 ` Linus Walleij
2011-11-06 17:52 ` [PATCH 36/41] ARM: restart: versatile: " Russell King - ARM Linux
2011-11-06 17:52 ` [PATCH 37/41] ARM: restart: Versatile Express: " Russell King - ARM Linux
2011-11-06 17:52 ` [PATCH 38/41] ARM: restart: w90x900: " Russell King - ARM Linux
2011-11-07 17:16 ` Russell King - ARM Linux
2011-11-06 17:53 ` [PATCH 39/41] ARM: restart: lpc32xx & u300: remove unnecessary printk Russell King - ARM Linux
2011-11-11 18:46 ` Linus Walleij
2011-11-11 19:00 ` Russell King - ARM Linux
2011-11-11 19:32 ` Linus Walleij
2011-11-06 17:53 ` [PATCH 40/41] ARM: restart: remove comments about adding code to arch_reset() Russell King - ARM Linux
2011-11-07 2:59 ` Nicolas Pitre
2011-11-08 15:47 ` Jamie Iles
2011-11-10 23:35 ` Tony Lindgren
2011-11-06 17:53 ` [PATCH 41/41] ARM: restart: remove the now empty arch_reset() Russell King - ARM Linux
2011-11-07 3:02 ` Nicolas Pitre
2011-11-07 17:15 ` H Hartley Sweeten
2011-11-08 15:48 ` Jamie Iles
2011-11-10 23:38 ` Tony Lindgren
2011-11-25 21:44 ` Linus Walleij
2011-11-07 2:48 ` [01: PATCH 0/7] Preparation for arch_reset changes Nicolas Pitre
2011-11-07 13:31 ` Will Deacon
2011-11-07 17:24 ` H Hartley Sweeten
2011-11-08 5:00 ` Kukjin Kim
2011-11-08 10:05 ` Russell King - ARM Linux
2011-11-21 9:56 ` Russell King - ARM Linux
2011-11-22 11:21 ` Will Deacon
2011-11-22 15:24 ` Russell King - ARM Linux
2011-11-22 15:29 ` Will Deacon
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=E1RN6mE-0001XZ-RX@rmk-PC.arm.linux.org.uk \
--to=linux@arm$(echo .)linux.org.uk \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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