diff options
author | Benoit Cousson <b-cousson@ti.com> | 2011-07-10 07:56:31 -0400 |
---|---|---|
committer | Paul Walmsley <paul@pwsan.com> | 2011-07-10 07:56:31 -0400 |
commit | e54433f10d67f8e2cf786e8173281f1caeda1959 (patch) | |
tree | 9df5add5ec24724037fc13efb7c4d40090c15104 /arch/arm/mach-omap2/prcm.c | |
parent | eaac329dfa6d3a4025242bf34d33aa3cb9df9f9f (diff) |
OMAP4: prm: Replace warm reset API with the offset based version
The warm reset function was still using the obsolete API.
Replace it by the new one and move the file to the proper c file.
Change the function names to stick to the file convention as
suggested by Paul Walmsley <paul@pwsan.com>:
prm_xxx -> prminst_xxx
Signed-off-by: Benoit Cousson <b-cousson@ti.com>
Cc: Paul Walmsley <paul@pwsan.com>
Cc: Rajendra Nayak <rnayak@ti.com>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/prcm.c')
-rw-r--r-- | arch/arm/mach-omap2/prcm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c index 6be14389e4f3..2e40a5cf0163 100644 --- a/arch/arm/mach-omap2/prcm.c +++ b/arch/arm/mach-omap2/prcm.c | |||
@@ -70,7 +70,7 @@ static void omap_prcm_arch_reset(char mode, const char *cmd) | |||
70 | prcm_offs = OMAP3430_GR_MOD; | 70 | prcm_offs = OMAP3430_GR_MOD; |
71 | omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0)); | 71 | omap3_ctrl_write_boot_mode((cmd ? (u8)*cmd : 0)); |
72 | } else if (cpu_is_omap44xx()) { | 72 | } else if (cpu_is_omap44xx()) { |
73 | omap4_prm_global_warm_sw_reset(); /* never returns */ | 73 | omap4_prminst_global_warm_sw_reset(); /* never returns */ |
74 | } else { | 74 | } else { |
75 | WARN_ON(1); | 75 | WARN_ON(1); |
76 | } | 76 | } |