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>
master
Russell King 11 years ago
parent b95ff9fe24
commit dd1661e27a
  1. 2
      arch/arm/mach-spear3xx/include/mach/generic.h
  2. 1
      arch/arm/mach-spear3xx/spear300_evb.c
  3. 1
      arch/arm/mach-spear3xx/spear310_evb.c
  4. 1
      arch/arm/mach-spear3xx/spear320_evb.c
  5. 2
      arch/arm/mach-spear6xx/include/mach/generic.h
  6. 1
      arch/arm/mach-spear6xx/spear600_evb.c
  7. 2
      arch/arm/plat-spear/Makefile
  8. 11
      arch/arm/plat-spear/include/plat/system.h
  9. 27
      arch/arm/plat-spear/restart.c

@ -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)

@ -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

@ -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

@ -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

@ -41,6 +41,8 @@ void __init spear6xx_init(void);
void __init spear600_init(void);
void __init spear6xx_clk_init(void);
void spear_restart(char, const char *);
/* Add spear600 machine device structure declarations here */
#endif /* __MACH_GENERIC_H */

@ -48,4 +48,5 @@ MACHINE_START(SPEAR600, "ST-SPEAR600-EVB")
.init_irq = spear6xx_init_irq,
.timer = &spear6xx_timer,
.init_machine = spear600_evb_init,
.restart = spear_restart,
MACHINE_END

@ -3,6 +3,6 @@
#
# Common support
obj-y := clock.o time.o
obj-y := clock.o restart.o time.o
obj-$(CONFIG_ARCH_SPEAR3XX) += shirq.o padmux.o

@ -14,10 +14,6 @@
#ifndef __PLAT_SYSTEM_H
#define __PLAT_SYSTEM_H
#include <linux/io.h>
#include <asm/hardware/sp810.h>
#include <mach/hardware.h>
static inline void arch_idle(void)
{
/*
@ -29,13 +25,6 @@ static inline void arch_idle(void)
static inline void arch_reset(char mode, const char *cmd)
{
if (mode == 's') {
/* software reset, Jump into ROM at address 0 */
soft_restart(0);
} else {
/* hardware reset, Use on-chip reset capability */
sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);
}
}
#endif /* __PLAT_SYSTEM_H */

@ -0,0 +1,27 @@
/*
* arch/arm/plat-spear/restart.c
*
* SPEAr platform specific restart functions
*
* Copyright (C) 2009 ST Microelectronics
* Viresh Kumar<viresh.kumar@st.com>
*
* This file is licensed under the terms of the GNU General Public
* License version 2. This program is licensed "as is" without any
* warranty of any kind, whether express or implied.
*/
#include <linux/io.h>
#include <asm/hardware/sp810.h>
#include <mach/hardware.h>
#include <mach/generic.h>
void spear_restart(char mode, const char *cmd)
{
if (mode == 's') {
/* software reset, Jump into ROM at address 0 */
soft_restart(0);
} else {
/* hardware reset, Use on-chip reset capability */
sysctl_soft_reset((void __iomem *)VA_SPEAR_SYS_CTRL_BASE);
}
}
Loading…
Cancel
Save