aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-shmobile
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2015-02-23 10:59:29 -0500
committerSimon Horman <horms+renesas@verge.net.au>2015-02-23 18:22:50 -0500
commit3c7585b9901c335d10a04c8495164cb113c0b8f2 (patch)
tree5ab900851af28aac3dd067c702380ce03e7b9a09 /arch/arm/mach-shmobile
parentbee7a18e85421ed3ec0131574378de10b5762d54 (diff)
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/arm/mach-shmobile')
-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)
783 shmobile_setup_console(); 783 shmobile_setup_console();
784} 784}
785 785
786#define RESCNT2 IOMEM(0xe6188020)
787static void sh73a0_restart(enum reboot_mode mode, const char *cmd)
788{
789 /* Do soft power on reset */
790 writel((1 << 31), RESCNT2);
791}
792
793#ifdef CONFIG_USE_OF 786#ifdef CONFIG_USE_OF
794 787
795static void __init sh73a0_generic_init(void) 788static void __init sh73a0_generic_init(void)
@@ -812,7 +805,6 @@ DT_MACHINE_START(SH73A0_DT, "Generic SH73A0 (Flattened Device Tree)")
812 .init_early = shmobile_init_delay, 805 .init_early = shmobile_init_delay,
813 .init_machine = sh73a0_generic_init, 806 .init_machine = sh73a0_generic_init,
814 .init_late = shmobile_init_late, 807 .init_late = shmobile_init_late,
815 .restart = sh73a0_restart,
816 .dt_compat = sh73a0_boards_compat_dt, 808 .dt_compat = sh73a0_boards_compat_dt,
817MACHINE_END 809MACHINE_END
818#endif /* CONFIG_USE_OF */ 810#endif /* CONFIG_USE_OF */