diff options
author | Tero Kristo <t-kristo@ti.com> | 2014-10-27 11:39:26 -0400 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2014-10-27 11:39:26 -0400 |
commit | 61c8621e2bd14faad9b89ab2284955b28000bcd5 (patch) | |
tree | b7b24d5490f68336f06dcee1dbc50d2fc2254a55 /arch/arm/mach-omap2/omap4-restart.c | |
parent | 4984eeaf71f033d1ca6b644e4fcdef4b3e6a97b4 (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.c | 6 |
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 @@ | |||
9 | 9 | ||
10 | #include <linux/types.h> | 10 | #include <linux/types.h> |
11 | #include <linux/reboot.h> | 11 | #include <linux/reboot.h> |
12 | #include "prminst44xx.h" | 12 | #include "prm.h" |
13 | 13 | ||
14 | /** | 14 | /** |
15 | * omap44xx_restart - trigger a software restart of the SoC | 15 | * omap44xx_restart - trigger a software restart of the SoC |
@@ -22,7 +22,5 @@ | |||
22 | void omap44xx_restart(enum reboot_mode mode, const char *cmd) | 22 | void omap44xx_restart(enum reboot_mode mode, const char *cmd) |
23 | { | 23 | { |
24 | /* XXX Should save 'cmd' into scratchpad for use after reboot */ | 24 | /* XXX Should save 'cmd' into scratchpad for use after reboot */ |
25 | omap4_prminst_global_warm_sw_reset(); /* never returns */ | 25 | omap_prm_reset_system(); |
26 | while (1) | ||
27 | ; | ||
28 | } | 26 | } |