summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/omap4-restart.c
diff options
context:
space:
mode:
authorTero Kristo <t-kristo@ti.com>2014-10-27 08:39:26 -0700
committerTony Lindgren <tony@atomide.com>2014-10-27 08:39:26 -0700
commit61c8621e2bd14faad9b89ab2284955b28000bcd5 (patch)
treeb7b24d5490f68336f06dcee1dbc50d2fc2254a55 /arch/arm/mach-omap2/omap4-restart.c
parent4984eeaf71f033d1ca6b644e4fcdef4b3e6a97b4 (diff)
ARM: OMAP2+: PRM: provide generic API for system reset
This patch combines the various prm_warm_reset calls under a common API prm_reset_system, and adds the SoC specific implementation under prm_ll_data. Signed-off-by: Tero Kristo <t-kristo@ti.com> Acked-by: Paul Walmsley <paul@pwsan.com> Tested-by: Nishanth Menon <nm@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/omap4-restart.c')
-rw-r--r--arch/arm/mach-omap2/omap4-restart.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap4-restart.c b/arch/arm/mach-omap2/omap4-restart.c
index 41dfd7da8170..a99e7f7fb5be 100644
--- a/arch/arm/mach-omap2/omap4-restart.c
+++ b/arch/arm/mach-omap2/omap4-restart.c
@@ -9,7 +9,7 @@
#include <linux/types.h>
#include <linux/reboot.h>
-#include "prminst44xx.h"
+#include "prm.h"
/**
* omap44xx_restart - trigger a software restart of the SoC
@@ -22,7 +22,5 @@
void omap44xx_restart(enum reboot_mode mode, const char *cmd)
{
/* XXX Should save 'cmd' into scratchpad for use after reboot */
- omap4_prminst_global_warm_sw_reset(); /* never returns */
- while (1)
- ;
+ omap_prm_reset_system();
}