From: "Cousson, Benoit" <b-cousson@ti.com>
To: Rajendra Nayak <rnayak@ti.com>
Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org,
Paul Walmsley <paul@pwsan.com>, Balaji TK <balajitk@ti.com>
Subject: Re: [PATCH] ARM: OMAP: hwmod: Use sysc_fields->srst_shift and get rid of hardcoded SYSC_TYPE2_SOFTRESET_MASK
Date: Thu, 1 Mar 2012 15:08:10 +0100 [thread overview]
Message-ID: <4F4F82CA.7040607@ti.com> (raw)
In-Reply-To: <1330609674-20826-1-git-send-email-rnayak@ti.com>
On 3/1/2012 2:47 PM, Rajendra Nayak wrote:
> This is useful when we have broken type2 compliant IPs' where
> the softreset shift is not the same as SYSC_TYPE2_SOFTRESET_SHIFT
> and hence is overridden using sysc_fields->srst_shift.
>
> We have atleast one such instance now with onchip keypad on OMAP5
Nit: space is missing.
> which has a different softreset shift as compared to other type2
> IPs'.
A broken IP again :-)
That's anyway a good fix since the srst_shift was already configurable,
so having a hard-coded mask was wrong or at least error prone for non
standard IP.
> Signed-off-by: Rajendra Nayak<rnayak@ti.com>
> Cc: Paul Walmsley<paul@pwsan.com>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Balaji TK<balajitk@ti.com>
> Tested-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
> Paul,
>
> I based the patch on top of your reset/data cleanup series
> for hwmod. So its based on 'hwmod_data_cleanup_3.4' branch.
>
> regards,
> Rajendra
>
> arch/arm/mach-omap2/omap_hwmod.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 3462dc5..6aadba2 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -1524,7 +1524,7 @@ static int _read_hardreset(struct omap_hwmod *oh, const char *name)
> */
> static int _ocp_softreset(struct omap_hwmod *oh)
> {
> - u32 v;
> + u32 v, softrst_mask;
> int c = 0;
> int ret = 0;
>
> @@ -1559,11 +1559,13 @@ static int _ocp_softreset(struct omap_hwmod *oh)
> oh->class->sysc->syss_offs)
> & SYSS_RESETDONE_MASK),
> MAX_MODULE_SOFTRESET_WAIT, c);
> - else if (oh->class->sysc->sysc_flags& SYSC_HAS_RESET_STATUS)
> + else if (oh->class->sysc->sysc_flags& SYSC_HAS_RESET_STATUS) {
> + softrst_mask = (0x1<< oh->class->sysc->sysc_fields->srst_shift);
> omap_test_timeout(!(omap_hwmod_read(oh,
> oh->class->sysc->sysc_offs)
> - & SYSC_TYPE2_SOFTRESET_MASK),
> + & softrst_mask),
> MAX_MODULE_SOFTRESET_WAIT, c);
> + }
>
> if (c == MAX_MODULE_SOFTRESET_WAIT)
> pr_warning("omap_hwmod: %s: softreset failed (waited %d usec)\n",
Acked-by: Benoit Cousson<b-cousson@ti.com>
Thanks,
Benoit
WARNING: multiple messages have this Message-ID (diff)
From: b-cousson@ti.com (Cousson, Benoit)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: OMAP: hwmod: Use sysc_fields->srst_shift and get rid of hardcoded SYSC_TYPE2_SOFTRESET_MASK
Date: Thu, 1 Mar 2012 15:08:10 +0100 [thread overview]
Message-ID: <4F4F82CA.7040607@ti.com> (raw)
In-Reply-To: <1330609674-20826-1-git-send-email-rnayak@ti.com>
On 3/1/2012 2:47 PM, Rajendra Nayak wrote:
> This is useful when we have broken type2 compliant IPs' where
> the softreset shift is not the same as SYSC_TYPE2_SOFTRESET_SHIFT
> and hence is overridden using sysc_fields->srst_shift.
>
> We have atleast one such instance now with onchip keypad on OMAP5
Nit: space is missing.
> which has a different softreset shift as compared to other type2
> IPs'.
A broken IP again :-)
That's anyway a good fix since the srst_shift was already configurable,
so having a hard-coded mask was wrong or at least error prone for non
standard IP.
> Signed-off-by: Rajendra Nayak<rnayak@ti.com>
> Cc: Paul Walmsley<paul@pwsan.com>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Balaji TK<balajitk@ti.com>
> Tested-by: Sourav Poddar<sourav.poddar@ti.com>
> ---
> Paul,
>
> I based the patch on top of your reset/data cleanup series
> for hwmod. So its based on 'hwmod_data_cleanup_3.4' branch.
>
> regards,
> Rajendra
>
> arch/arm/mach-omap2/omap_hwmod.c | 8 +++++---
> 1 files changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 3462dc5..6aadba2 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -1524,7 +1524,7 @@ static int _read_hardreset(struct omap_hwmod *oh, const char *name)
> */
> static int _ocp_softreset(struct omap_hwmod *oh)
> {
> - u32 v;
> + u32 v, softrst_mask;
> int c = 0;
> int ret = 0;
>
> @@ -1559,11 +1559,13 @@ static int _ocp_softreset(struct omap_hwmod *oh)
> oh->class->sysc->syss_offs)
> & SYSS_RESETDONE_MASK),
> MAX_MODULE_SOFTRESET_WAIT, c);
> - else if (oh->class->sysc->sysc_flags& SYSC_HAS_RESET_STATUS)
> + else if (oh->class->sysc->sysc_flags& SYSC_HAS_RESET_STATUS) {
> + softrst_mask = (0x1<< oh->class->sysc->sysc_fields->srst_shift);
> omap_test_timeout(!(omap_hwmod_read(oh,
> oh->class->sysc->sysc_offs)
> - & SYSC_TYPE2_SOFTRESET_MASK),
> + & softrst_mask),
> MAX_MODULE_SOFTRESET_WAIT, c);
> + }
>
> if (c == MAX_MODULE_SOFTRESET_WAIT)
> pr_warning("omap_hwmod: %s: softreset failed (waited %d usec)\n",
Acked-by: Benoit Cousson<b-cousson@ti.com>
Thanks,
Benoit
next prev parent reply other threads:[~2012-03-01 14:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-01 13:47 [PATCH] ARM: OMAP: hwmod: Use sysc_fields->srst_shift and get rid of hardcoded SYSC_TYPE2_SOFTRESET_MASK Rajendra Nayak
2012-03-01 13:47 ` Rajendra Nayak
2012-03-01 14:08 ` Cousson, Benoit [this message]
2012-03-01 14:08 ` Cousson, Benoit
2012-03-02 1:08 ` Paul Walmsley
2012-03-02 1:08 ` Paul Walmsley
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=4F4F82CA.7040607@ti.com \
--to=b-cousson@ti.com \
--cc=balajitk@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=rnayak@ti.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: link
Be 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.