From: Vaibhav Bedia <vaibhav.bedia@ti.com> To: linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org Cc: khilman@ti.com, paul@pwsan.com, b-cousson@ti.com, tony@atomide.com, Vaibhav Bedia <vaibhav.bedia@ti.com> Subject: [PATCH 04/15] ARM: OMAP2+: hwmod: Update the reset API for AM33XX Date: Fri, 2 Nov 2012 18:02:35 +0530 [thread overview] Message-ID: <1351859566-24818-5-git-send-email-vaibhav.bedia@ti.com> (raw) In-Reply-To: <1351859566-24818-1-git-send-email-vaibhav.bedia@ti.com> WKUP-M3 has a reset status bit (RM_WKUP_STST.WKUP_M3_LRST) Update the hardreset API to take care of the same to ensure that the reset line properly deasserted. Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> --- arch/arm/mach-omap2/omap_hwmod.c | 5 +---- arch/arm/mach-omap2/prm33xx.c | 15 +++++++-------- arch/arm/mach-omap2/prm33xx.h | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 37eeb45..a1d5835 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2944,11 +2944,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); diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c index 53ec9cb..0f29cb9 100644 --- a/arch/arm/mach-omap2/prm33xx.c +++ b/arch/arm/mach-omap2/prm33xx.c @@ -112,23 +112,22 @@ int am33xx_prm_assert_hardreset(u8 shift, s16 inst, u16 rstctrl_offs) * -EINVAL upon an argument error, -EEXIST if the submodule was already out * of reset, or -EBUSY if the submodule did not exit reset promptly. */ -int am33xx_prm_deassert_hardreset(u8 shift, s16 inst, +int am33xx_prm_deassert_hardreset(u8 shift, u8 st_shift, s16 inst, u16 rstctrl_offs, u16 rstst_offs) { int c; - u32 mask = 1 << shift; - - /* Check the current status to avoid de-asserting the line twice */ - if (am33xx_prm_is_hardreset_asserted(shift, inst, rstctrl_offs) == 0) - return -EEXIST; + u32 mask = 1 << st_shift; /* Clear the reset status by writing 1 to the status bit */ am33xx_prm_rmw_reg_bits(0xffffffff, mask, inst, rstst_offs); + /* de-assert the reset control line */ + mask = 1 << shift; + am33xx_prm_rmw_reg_bits(mask, 0, inst, rstctrl_offs); - /* wait the status to be set */ - omap_test_timeout(am33xx_prm_is_hardreset_asserted(shift, inst, + /* wait the status to be set */ + omap_test_timeout(am33xx_prm_is_hardreset_asserted(st_shift, inst, rstst_offs), MAX_MODULE_HARDRESET_WAIT, c); diff --git a/arch/arm/mach-omap2/prm33xx.h b/arch/arm/mach-omap2/prm33xx.h index 3f25c56..181fdab 100644 --- a/arch/arm/mach-omap2/prm33xx.h +++ b/arch/arm/mach-omap2/prm33xx.h @@ -124,6 +124,6 @@ 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 -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: vaibhav.bedia@ti.com (Vaibhav Bedia) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 04/15] ARM: OMAP2+: hwmod: Update the reset API for AM33XX Date: Fri, 2 Nov 2012 18:02:35 +0530 [thread overview] Message-ID: <1351859566-24818-5-git-send-email-vaibhav.bedia@ti.com> (raw) In-Reply-To: <1351859566-24818-1-git-send-email-vaibhav.bedia@ti.com> WKUP-M3 has a reset status bit (RM_WKUP_STST.WKUP_M3_LRST) Update the hardreset API to take care of the same to ensure that the reset line properly deasserted. Signed-off-by: Vaibhav Bedia <vaibhav.bedia@ti.com> --- arch/arm/mach-omap2/omap_hwmod.c | 5 +---- arch/arm/mach-omap2/prm33xx.c | 15 +++++++-------- arch/arm/mach-omap2/prm33xx.h | 2 +- 3 files changed, 9 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c index 37eeb45..a1d5835 100644 --- a/arch/arm/mach-omap2/omap_hwmod.c +++ b/arch/arm/mach-omap2/omap_hwmod.c @@ -2944,11 +2944,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); diff --git a/arch/arm/mach-omap2/prm33xx.c b/arch/arm/mach-omap2/prm33xx.c index 53ec9cb..0f29cb9 100644 --- a/arch/arm/mach-omap2/prm33xx.c +++ b/arch/arm/mach-omap2/prm33xx.c @@ -112,23 +112,22 @@ int am33xx_prm_assert_hardreset(u8 shift, s16 inst, u16 rstctrl_offs) * -EINVAL upon an argument error, -EEXIST if the submodule was already out * of reset, or -EBUSY if the submodule did not exit reset promptly. */ -int am33xx_prm_deassert_hardreset(u8 shift, s16 inst, +int am33xx_prm_deassert_hardreset(u8 shift, u8 st_shift, s16 inst, u16 rstctrl_offs, u16 rstst_offs) { int c; - u32 mask = 1 << shift; - - /* Check the current status to avoid de-asserting the line twice */ - if (am33xx_prm_is_hardreset_asserted(shift, inst, rstctrl_offs) == 0) - return -EEXIST; + u32 mask = 1 << st_shift; /* Clear the reset status by writing 1 to the status bit */ am33xx_prm_rmw_reg_bits(0xffffffff, mask, inst, rstst_offs); + /* de-assert the reset control line */ + mask = 1 << shift; + am33xx_prm_rmw_reg_bits(mask, 0, inst, rstctrl_offs); - /* wait the status to be set */ - omap_test_timeout(am33xx_prm_is_hardreset_asserted(shift, inst, + /* wait the status to be set */ + omap_test_timeout(am33xx_prm_is_hardreset_asserted(st_shift, inst, rstst_offs), MAX_MODULE_HARDRESET_WAIT, c); diff --git a/arch/arm/mach-omap2/prm33xx.h b/arch/arm/mach-omap2/prm33xx.h index 3f25c56..181fdab 100644 --- a/arch/arm/mach-omap2/prm33xx.h +++ b/arch/arm/mach-omap2/prm33xx.h @@ -124,6 +124,6 @@ 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 -- 1.7.0.4
next prev parent reply other threads:[~2012-11-02 12:34 UTC|newest] Thread overview: 218+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-11-02 12:32 [RFC 00/15] Add basic suspend-resume support for AM33XX Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-02 12:32 ` [PATCH 01/15] ARM: OMAP2+: mailbox: Add an API for flushing the FIFO Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-02 19:00 ` Tony Lindgren 2012-11-02 19:00 ` Tony Lindgren 2012-11-03 8:24 ` Bedia, Vaibhav 2012-11-03 8:24 ` Bedia, Vaibhav 2012-11-03 16:03 ` Santosh Shilimkar 2012-11-03 16:03 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-05 14:59 ` Santosh Shilimkar 2012-11-05 14:59 ` Santosh Shilimkar 2012-11-02 12:32 ` [PATCH 02/15] ARM: OMAP2+: mailbox: Add support for AM33XX Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 0:14 ` Russ Dill 2012-11-03 0:14 ` Russ Dill 2012-11-03 8:39 ` Bedia, Vaibhav 2012-11-03 8:39 ` Bedia, Vaibhav 2012-11-03 13:48 ` Bedia, Vaibhav 2012-11-03 13:48 ` Bedia, Vaibhav 2012-11-03 16:10 ` Santosh Shilimkar 2012-11-03 16:10 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-05 15:00 ` Santosh Shilimkar 2012-11-05 15:00 ` Santosh Shilimkar 2012-11-02 12:32 ` [PATCH 03/15] ARM: OMAP: mailbox: Convert to device_initcall Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 16:12 ` Santosh Shilimkar 2012-11-03 16:12 ` Santosh Shilimkar 2012-11-02 12:32 ` Vaibhav Bedia [this message] 2012-11-02 12:32 ` [PATCH 04/15] ARM: OMAP2+: hwmod: Update the reset API for AM33XX Vaibhav Bedia 2012-11-05 6:58 ` Vaibhav Hiremath 2012-11-05 6:58 ` Vaibhav Hiremath 2012-11-05 17:57 ` Bedia, Vaibhav 2012-11-05 17:57 ` Bedia, Vaibhav 2012-11-06 6:06 ` Hiremath, Vaibhav 2012-11-06 6:06 ` Hiremath, Vaibhav 2012-11-06 7:19 ` Bedia, Vaibhav 2012-11-06 7:19 ` Bedia, Vaibhav 2012-11-02 12:32 ` [PATCH 05/15] ARM: OMAP2+: AM33XX: Update WKUP_M3 hwmod entry for reset status Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 16:15 ` Santosh Shilimkar 2012-11-03 16:15 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-05 6:59 ` Vaibhav Hiremath 2012-11-05 6:59 ` Vaibhav Hiremath 2012-11-02 12:32 ` [PATCH 06/15] ARM: OMAP2+: hwmod: Enable OCMCRAM registration in AM33XX Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 16:16 ` Santosh Shilimkar 2012-11-03 16:16 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-05 7:23 ` Vaibhav Hiremath 2012-11-05 7:23 ` Vaibhav Hiremath 2012-11-05 17:57 ` Bedia, Vaibhav 2012-11-05 17:57 ` Bedia, Vaibhav 2012-11-06 6:07 ` Hiremath, Vaibhav 2012-11-06 6:07 ` Hiremath, Vaibhav 2012-11-02 12:32 ` [PATCH 07/15] ARM: OMAP2+: hwmod: Update the hwmod data for TPTCs " Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-05 7:19 ` Vaibhav Hiremath 2012-11-05 7:19 ` Vaibhav Hiremath 2012-11-02 12:32 ` [PATCH 08/15] ARM: OMAP2+: hwmod: Fix the omap_hwmod_addr_space for CPGMAC0 Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 16:18 ` Santosh Shilimkar 2012-11-03 16:18 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-05 9:10 ` Bedia, Vaibhav 2012-11-05 9:10 ` Bedia, Vaibhav 2012-11-06 9:29 ` Vaibhav Hiremath 2012-11-06 9:29 ` Vaibhav Hiremath 2012-11-06 10:09 ` Bedia, Vaibhav 2012-11-06 10:09 ` Bedia, Vaibhav 2012-11-06 13:08 ` Hiremath, Vaibhav 2012-11-06 13:08 ` Hiremath, Vaibhav 2012-11-06 13:46 ` Bedia, Vaibhav 2012-11-06 13:46 ` Bedia, Vaibhav 2012-11-06 13:50 ` Benoit Cousson 2012-11-06 13:50 ` Benoit Cousson 2012-11-06 13:56 ` Bedia, Vaibhav 2012-11-06 13:56 ` Bedia, Vaibhav 2012-11-02 12:32 ` [PATCH 09/15] ARM: OMAP: AM33XX: Remove unnecessary include and use __ASSEMBLER__ macros Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 16:29 ` Santosh Shilimkar 2012-11-03 16:29 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-02 12:32 ` [PATCH 10/15] ARM: OMAP2+: control: Add some AM33XX Control module registers Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-02 12:32 ` [PATCH 11/15] ARM: OMAP: timer: Interchange clksrc and clkevt for AM33XX Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 11:43 ` Kevin Hilman 2012-11-03 11:43 ` Kevin Hilman 2012-11-03 12:47 ` Bedia, Vaibhav 2012-11-03 12:47 ` Bedia, Vaibhav 2012-11-03 13:04 ` Kevin Hilman 2012-11-03 13:04 ` Kevin Hilman 2012-11-03 13:48 ` Bedia, Vaibhav 2012-11-03 13:48 ` Bedia, Vaibhav 2012-11-05 18:03 ` Kevin Hilman 2012-11-05 18:03 ` Kevin Hilman 2012-11-05 21:59 ` Santosh Shilimkar 2012-11-05 21:59 ` Santosh Shilimkar 2012-11-06 14:38 ` Bedia, Vaibhav 2012-11-06 14:38 ` Bedia, Vaibhav 2012-11-08 13:15 ` Bedia, Vaibhav 2012-11-08 13:15 ` Bedia, Vaibhav 2012-11-06 14:33 ` Bedia, Vaibhav 2012-11-06 14:33 ` Bedia, Vaibhav 2012-11-03 16:22 ` Kevin Hilman 2012-11-03 16:22 ` Kevin Hilman 2012-11-05 4:40 ` Bedia, Vaibhav 2012-11-05 4:40 ` Bedia, Vaibhav 2012-11-03 16:31 ` Santosh Shilimkar 2012-11-03 16:31 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-08 20:41 ` Jon Hunter 2012-11-08 20:41 ` Jon Hunter 2012-11-12 22:54 ` Tony Lindgren 2012-11-12 22:54 ` Tony Lindgren 2012-11-02 12:32 ` [PATCH 12/15] ARM: OMAP: timer: Add suspend-resume callbacks for clockevent device Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 12:15 ` Kevin Hilman 2012-11-03 12:15 ` Kevin Hilman 2012-11-03 13:17 ` Bedia, Vaibhav 2012-11-03 13:17 ` Bedia, Vaibhav 2012-11-03 13:41 ` Kevin Hilman 2012-11-03 13:41 ` Kevin Hilman 2012-11-03 14:03 ` Bedia, Vaibhav 2012-11-03 14:03 ` Bedia, Vaibhav 2012-11-05 21:20 ` Jon Hunter 2012-11-05 21:20 ` Jon Hunter 2012-11-06 9:38 ` Bedia, Vaibhav 2012-11-06 9:38 ` Bedia, Vaibhav 2012-11-06 16:02 ` Jon Hunter 2012-11-06 16:02 ` Jon Hunter 2012-11-03 15:52 ` Santosh Shilimkar 2012-11-03 15:52 ` Santosh Shilimkar 2012-11-04 15:25 ` Bedia, Vaibhav 2012-11-04 15:25 ` Bedia, Vaibhav 2012-11-05 14:55 ` Santosh Shilimkar 2012-11-05 14:55 ` Santosh Shilimkar 2012-11-05 21:04 ` Jon Hunter 2012-11-05 21:04 ` Jon Hunter 2012-11-06 7:32 ` Bedia, Vaibhav 2012-11-06 7:32 ` Bedia, Vaibhav 2012-11-06 16:00 ` Jon Hunter 2012-11-06 16:00 ` Jon Hunter 2012-11-02 12:32 ` [PATCH 13/15] ARM: DTS: AM33XX: Add nodes for OCMCRAM and Mailbox Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 12:16 ` Kevin Hilman 2012-11-03 12:16 ` Kevin Hilman 2012-11-03 13:17 ` Bedia, Vaibhav 2012-11-03 13:17 ` Bedia, Vaibhav 2012-11-03 15:54 ` Santosh Shilimkar 2012-11-03 15:54 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-05 14:53 ` Santosh Shilimkar 2012-11-05 14:53 ` Santosh Shilimkar 2012-11-05 17:57 ` Bedia, Vaibhav 2012-11-05 17:57 ` Bedia, Vaibhav 2012-11-05 19:29 ` Kevin Hilman 2012-11-05 19:29 ` Kevin Hilman 2012-11-05 21:19 ` Santosh Shilimkar 2012-11-05 21:19 ` Santosh Shilimkar 2012-11-05 21:45 ` Santosh Shilimkar 2012-11-05 21:45 ` Santosh Shilimkar 2012-11-06 5:08 ` Bedia, Vaibhav 2012-11-06 5:08 ` Bedia, Vaibhav 2012-11-05 14:58 ` Santosh Shilimkar 2012-11-05 14:58 ` Santosh Shilimkar 2012-11-02 12:32 ` [PATCH 14/15] ARM: OMAP2+: omap2plus_defconfig: Enable Mailbox Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-03 12:20 ` Kevin Hilman 2012-11-03 12:20 ` Kevin Hilman 2012-11-03 13:17 ` Bedia, Vaibhav 2012-11-03 13:17 ` Bedia, Vaibhav 2012-11-03 13:43 ` Kevin Hilman 2012-11-03 13:43 ` Kevin Hilman 2012-11-02 12:32 ` [PATCH 15/15] ARM: OMAP2+: AM33XX: Basic suspend resume support Vaibhav Bedia 2012-11-02 12:32 ` Vaibhav Bedia 2012-11-02 13:11 ` Bedia, Vaibhav 2012-11-02 13:11 ` Bedia, Vaibhav 2012-11-03 16:57 ` Santosh Shilimkar 2012-11-03 16:57 ` Santosh Shilimkar 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-04 15:26 ` Bedia, Vaibhav 2012-11-05 17:40 ` Kevin Hilman 2012-11-05 17:40 ` Kevin Hilman 2012-11-05 21:52 ` Santosh Shilimkar 2012-11-05 21:52 ` Santosh Shilimkar 2012-11-06 12:29 ` Bedia, Vaibhav 2012-11-06 12:29 ` Bedia, Vaibhav 2012-11-06 12:38 ` Santosh Shilimkar 2012-11-06 12:38 ` Santosh Shilimkar 2012-11-06 13:00 ` Bedia, Vaibhav 2012-11-06 13:00 ` Bedia, Vaibhav 2012-11-06 10:40 ` Bedia, Vaibhav 2012-11-06 10:40 ` Bedia, Vaibhav 2012-11-07 1:06 ` Kevin Hilman 2012-11-07 1:06 ` Kevin Hilman 2012-11-07 13:25 ` Bedia, Vaibhav 2012-11-07 13:25 ` Bedia, Vaibhav 2012-11-07 17:15 ` Kevin Hilman 2012-11-07 17:15 ` Kevin Hilman 2012-11-08 13:05 ` Bedia, Vaibhav 2012-11-08 13:05 ` Bedia, Vaibhav 2012-11-02 22:16 ` [RFC 00/15] Add basic suspend-resume support for AM33XX Daniel Mack 2012-11-02 22:16 ` Daniel Mack 2012-11-03 8:39 ` Bedia, Vaibhav 2012-11-03 8:39 ` Bedia, Vaibhav
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1351859566-24818-5-git-send-email-vaibhav.bedia@ti.com \ --to=vaibhav.bedia@ti.com \ --cc=b-cousson@ti.com \ --cc=khilman@ti.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-omap@vger.kernel.org \ --cc=paul@pwsan.com \ --cc=tony@atomide.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.