From: Rajendra Nayak <rnayak@ti.com>
To: Rajendra Nayak <rnayak@ti.com>
Cc: b-cousson@ti.com, paul@pwsan.com, linux-omap@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Anand Gadiyar <gadiyar@ti.com>,
Shubhrajyoti D <shubhrajyoti@ti.com>
Subject: Re: [PATCH 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
Date: Tue, 13 Mar 2012 19:29:09 +0530 [thread overview]
Message-ID: <4F5F52AD.6090009@ti.com> (raw)
In-Reply-To: <1331646928-31119-3-git-send-email-rnayak@ti.com>
On Tuesday 13 March 2012 07:25 PM, Rajendra Nayak wrote:
> omap_hwmod_softreset() does not seem to wait for reset status
> after doing a softreset. Make it use _ocp_softreset() instead
> which does this correctly.
>
> Signed-off-by: Rajendra Nayak<rnayak@ti.com>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Paul Walmsley<paul@pwsan.com>
> Cc: Anand Gadiyar<gadiyar@ti.com>
> Cc: Shubhrajyoti D<shubhrajyoti@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod.c | 14 +++-----------
> 1 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index ae56939..9b49440 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -1907,20 +1907,12 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs)
> */
> int omap_hwmod_softreset(struct omap_hwmod *oh)
> {
> - u32 v;
> - int ret;
> -
> - if (!oh || !(oh->_sysc_cache))
> + if (!oh)
> return -EINVAL;
>
> - v = oh->_sysc_cache;
> - ret = _set_softreset(oh,&v);
> - if (ret)
> - goto error;
> - _write_sysconfig(v, oh);
> + _ocp_softreset(oh);
>
> -error:
> - return ret;
> + return 0;
Just realized, this should be 'return _ocp_softreset(oh);'
instead. will fix and repost.
> }
>
> /**
WARNING: multiple messages have this Message-ID (diff)
From: rnayak@ti.com (Rajendra Nayak)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
Date: Tue, 13 Mar 2012 19:29:09 +0530 [thread overview]
Message-ID: <4F5F52AD.6090009@ti.com> (raw)
In-Reply-To: <1331646928-31119-3-git-send-email-rnayak@ti.com>
On Tuesday 13 March 2012 07:25 PM, Rajendra Nayak wrote:
> omap_hwmod_softreset() does not seem to wait for reset status
> after doing a softreset. Make it use _ocp_softreset() instead
> which does this correctly.
>
> Signed-off-by: Rajendra Nayak<rnayak@ti.com>
> Cc: Benoit Cousson<b-cousson@ti.com>
> Cc: Paul Walmsley<paul@pwsan.com>
> Cc: Anand Gadiyar<gadiyar@ti.com>
> Cc: Shubhrajyoti D<shubhrajyoti@ti.com>
> ---
> arch/arm/mach-omap2/omap_hwmod.c | 14 +++-----------
> 1 files changed, 3 insertions(+), 11 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index ae56939..9b49440 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -1907,20 +1907,12 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs)
> */
> int omap_hwmod_softreset(struct omap_hwmod *oh)
> {
> - u32 v;
> - int ret;
> -
> - if (!oh || !(oh->_sysc_cache))
> + if (!oh)
> return -EINVAL;
>
> - v = oh->_sysc_cache;
> - ret = _set_softreset(oh,&v);
> - if (ret)
> - goto error;
> - _write_sysconfig(v, oh);
> + _ocp_softreset(oh);
>
> -error:
> - return ret;
> + return 0;
Just realized, this should be 'return _ocp_softreset(oh);'
instead. will fix and repost.
> }
>
> /**
next prev parent reply other threads:[~2012-03-13 13:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 13:55 [PATCH 0/2] Fixes in hwmod reset code Rajendra Nayak
2012-03-13 13:55 ` Rajendra Nayak
2012-03-13 13:55 ` [PATCH 1/2] ARM: omap: hwmod: Restore sysc after a reset Rajendra Nayak
2012-03-13 13:55 ` Rajendra Nayak
2012-04-04 15:41 ` Paul Walmsley
2012-04-04 15:41 ` Paul Walmsley
2012-04-05 7:11 ` Rajendra Nayak
2012-04-05 7:11 ` Rajendra Nayak
2012-03-13 13:55 ` [PATCH 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status Rajendra Nayak
2012-03-13 13:55 ` Rajendra Nayak
2012-03-13 13:59 ` Rajendra Nayak [this message]
2012-03-13 13:59 ` Rajendra Nayak
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=4F5F52AD.6090009@ti.com \
--to=rnayak@ti.com \
--cc=b-cousson@ti.com \
--cc=gadiyar@ti.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=paul@pwsan.com \
--cc=shubhrajyoti@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.