]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ARM: shmobile: sh73a0: Remove restart callback
authorGeert Uytterhoeven <geert+renesas@glider.be>
Mon, 23 Feb 2015 15:59:29 +0000 (16:59 +0100)
committerSimon Horman <horms+renesas@verge.net.au>
Mon, 23 Feb 2015 23:22:50 +0000 (08:22 +0900)
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>
arch/arm/mach-shmobile/setup-sh73a0.c

index 2f68459e7811432356058238b826f5f34010bd3d..fb2ab7590af8bf9dbca323f44e95d08a5afdf6cf 100644 (file)
@@ -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 */