diff options
| author | Vaibhav Bedia <vaibhav.bedia@ti.com> | 2013-01-29 12:15:06 +0100 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2013-02-08 15:25:28 +0100 |
| commit | 3c06f1b8c3ca74669b77c0aaee428b5c46d3e552 (patch) | |
| tree | 1cd374358db5df5be0b821d664d856b7f92df865 /arch/arm/mach-omap2/prm33xx.h | |
| parent | ARM: OMAP2+: AM33XX: hwmod: Update the WKUP-M3 hwmod with reset status bit (diff) | |
| download | linux-3c06f1b8c3ca74669b77c0aaee428b5c46d3e552.tar.xz linux-3c06f1b8c3ca74669b77c0aaee428b5c46d3e552.zip | |
ARM: OMAP2+: AM33XX: Update the hardreset API
WKUP-M3 has a reset status bit (RM_WKUP_STST.WKUP_M3_LRST)
Update the hardreset API to ensure that the reset line properly
deasserted.
Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com>
Acked-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Acked-by: Peter Korsgaard <jacmet@sunsite.dk>
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Diffstat (limited to 'arch/arm/mach-omap2/prm33xx.h')
| -rw-r--r-- | arch/arm/mach-omap2/prm33xx.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/prm33xx.h b/arch/arm/mach-omap2/prm33xx.h index 1c40373b0234..9b9918dfb119 100644 --- a/arch/arm/mach-omap2/prm33xx.h +++ b/arch/arm/mach-omap2/prm33xx.h @@ -125,7 +125,7 @@ extern void am33xx_prm_global_warm_sw_reset(void); extern int am33xx_prm_is_hardreset_asserted(u8 shift, s16 inst, u16 rstctrl_offs); extern int am33xx_prm_assert_hardreset(u8 shift, s16 inst, u16 rstctrl_offs); -extern int am33xx_prm_deassert_hardreset(u8 shift, s16 inst, +extern int am33xx_prm_deassert_hardreset(u8 shift, u8 st_shift, s16 inst, u16 rstctrl_offs, u16 rstst_offs); #endif /* ASSEMBLER */ #endif |