diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-05 21:10:37 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-01-05 12:57:20 +0000 |
| commit | dd1661e27a7879d3af0024ba94e171522492dd2f (patch) | |
| tree | e2df7cd15b15865aaf0bbf2d8018bb5da2930f02 /arch/arm/mach-spear3xx | |
| parent | b95ff9fe24e8757380bd9b53891df86f2499ebb8 (diff) | |
| download | blackbird-op-linux-dd1661e27a7879d3af0024ba94e171522492dd2f.tar.gz blackbird-op-linux-dd1661e27a7879d3af0024ba94e171522492dd2f.zip | |
ARM: restart: spear: use new restart hook
Hook these platforms restart code into the new restart hook rather
than using arch_reset().
Acked-by: Viresh Kumar <viresh.kumar@st.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-spear3xx')
| -rw-r--r-- | arch/arm/mach-spear3xx/include/mach/generic.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear300_evb.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear310_evb.c | 1 | ||||
| -rw-r--r-- | arch/arm/mach-spear3xx/spear320_evb.c | 1 |
4 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/mach-spear3xx/include/mach/generic.h b/arch/arm/mach-spear3xx/include/mach/generic.h index b8f31c3935f7..14276e5a98d2 100644 --- a/arch/arm/mach-spear3xx/include/mach/generic.h +++ b/arch/arm/mach-spear3xx/include/mach/generic.h @@ -42,6 +42,8 @@ void __init spear3xx_map_io(void); void __init spear3xx_init_irq(void); void __init spear3xx_init(void); +void spear_restart(char, const char *); + /* pad mux declarations */ #define PMX_FIRDA_MASK (1 << 14) #define PMX_I2C_MASK (1 << 13) diff --git a/arch/arm/mach-spear3xx/spear300_evb.c b/arch/arm/mach-spear3xx/spear300_evb.c index a5ff98eed1db..8b429f05b613 100644 --- a/arch/arm/mach-spear3xx/spear300_evb.c +++ b/arch/arm/mach-spear3xx/spear300_evb.c @@ -69,4 +69,5 @@ MACHINE_START(SPEAR300, "ST-SPEAR300-EVB") .init_irq = spear3xx_init_irq, .timer = &spear3xx_timer, .init_machine = spear300_evb_init, + .restart = spear_restart, MACHINE_END diff --git a/arch/arm/mach-spear3xx/spear310_evb.c b/arch/arm/mach-spear3xx/spear310_evb.c index 45d180d59362..a11d6ead0aed 100644 --- a/arch/arm/mach-spear3xx/spear310_evb.c +++ b/arch/arm/mach-spear3xx/spear310_evb.c @@ -75,4 +75,5 @@ MACHINE_START(SPEAR310, "ST-SPEAR310-EVB") .init_irq = spear3xx_init_irq, .timer = &spear3xx_timer, .init_machine = spear310_evb_init, + .restart = spear_restart, MACHINE_END diff --git a/arch/arm/mach-spear3xx/spear320_evb.c b/arch/arm/mach-spear3xx/spear320_evb.c index 22879848d73a..4239a70686c5 100644 --- a/arch/arm/mach-spear3xx/spear320_evb.c +++ b/arch/arm/mach-spear3xx/spear320_evb.c @@ -73,4 +73,5 @@ MACHINE_START(SPEAR320, "ST-SPEAR320-EVB") .init_irq = spear3xx_init_irq, .timer = &spear3xx_timer, .init_machine = spear320_evb_init, + .restart = spear_restart, MACHINE_END |
