summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2015-02-23 16:59:29 +0100
committerSimon Horman <horms+renesas@verge.net.au>2015-02-24 08:22:50 +0900
commit3c7585b9901c335d10a04c8495164cb113c0b8f2 (patch)
tree5ab900851af28aac3dd067c702380ce03e7b9a09 /arch
parentbee7a18e85421ed3ec0131574378de10b5762d54 (diff)
downloadblackbird-op-linux-3c7585b9901c335d10a04c8495164cb113c0b8f2.tar.gz
blackbird-op-linux-3c7585b9901c335d10a04c8495164cb113c0b8f2.zip
ARM: shmobile: sh73a0: Remove restart callback
Remove the restart handling hack from the sh73a0 generic multiplatform case. Restart on DT-based sh73a0 platforms is now handled through the R-Mobile reset driver. This basically reverts commit cad900819fba0176 ("ARM: shmobile: sh73a0: Add restart callback"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-shmobile/setup-sh73a0.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
index 2f68459e7811..fb2ab7590af8 100644
--- a/arch/arm/mach-shmobile/setup-sh73a0.c
+++ b/arch/arm/mach-shmobile/setup-sh73a0.c
@@ -783,13 +783,6 @@ void __init sh73a0_add_early_devices(void)
shmobile_setup_console();
}
-#define RESCNT2 IOMEM(0xe6188020)
-static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
-{
- /* Do soft power on reset */
- writel((1 << 31), RESCNT2);
-}
-
#ifdef CONFIG_USE_OF
static void __init sh73a0_generic_init(void)
@@ -812,7 +805,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
.init_early = shmobile_init_delay,
.init_machine = sh73a0_generic_init,
.init_late = shmobile_init_late,
- .restart = sh73a0_restart,
.dt_compat = sh73a0_boards_compat_dt,
MACHINE_END
#endif /* CONFIG_USE_OF */
OpenPOWER on IntegriCloud