diff options
| author | Vaibhav Bedia <vaibhav.bedia@ti.com> | 2013-01-29 16:45:06 +0530 |
|---|---|---|
| committer | Paul Walmsley <paul@pwsan.com> | 2013-02-08 07:25:28 -0700 |
| commit | 3c06f1b8c3ca74669b77c0aaee428b5c46d3e552 (patch) | |
| tree | 1cd374358db5df5be0b821d664d856b7f92df865 /arch/arm/mach-omap2/omap_hwmod.c | |
| parent | 3077fe69d7055b2ab118b299613394e13f4983a8 (diff) | |
| download | olio-linux-3.10-3c06f1b8c3ca74669b77c0aaee428b5c46d3e552.tar.xz olio-linux-3.10-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/omap_hwmod.c')
| -rw-r--r-- | arch/arm/mach-omap2/omap_hwmod.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 4653efb87a2..6549439d8d5 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -3041,11 +3041,8 @@ static int _am33xx_assert_hardreset(struct omap_hwmod *oh, static int _am33xx_deassert_hardreset(struct omap_hwmod *oh, struct omap_hwmod_rst_info *ohri) { - if (ohri->st_shift) - pr_err("omap_hwmod: %s: %s: hwmod data error: OMAP4 does not support st_shift\n", - oh->name, ohri->name); - return am33xx_prm_deassert_hardreset(ohri->rst_shift, + ohri->st_shift, oh->clkdm->pwrdm.ptr->prcm_offs, oh->prcm.omap4.rstctrl_offs, oh->prcm.omap4.rstst_offs); |