From: rnayak@ti•com (Rajendra Nayak)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH v2 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
Date: Fri, 13 Apr 2012 17:45:47 +0530 [thread overview]
Message-ID: <4F8818F3.3040803@ti.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1204130521110.25832@utopia.booyaka.com>
On Friday 13 April 2012 04:52 PM, Paul Walmsley wrote:
> Hi Rajendra
>
> here's what I've queued for v3.4-rc; please let me know if you have any
> comments.
Looks good, thanks Paul.
>
>
> - Paul
>
> From: Paul Walmsley<paul@pwsan•com>
> Date: Fri, 13 Apr 2012 05:08:43 -0600
> Subject: [PATCH] ARM: OMAP2+: hwmod: Revert "ARM: OMAP2+: hwmod: Make
> omap_hwmod_softreset wait for reset status"
>
> This reverts commit f9a2f9c3fa76eec55928e8e06f3094c8f01df7cb. This
> commit caused a regression in the I2C hwmod reset on OMAP2/3/4,
> logging messages similar to these during boot:
>
> [ 0.200378] omap_hwmod: i2c1: softreset failed (waited 10000 usec)
> [ 0.222076] omap_hwmod: i2c2: softreset failed (waited 10000 usec)
>
> While the original patch was intended to fix some reset-related timing
> issues, it's believed that these problems were actually fixed by
> commit 2800852a079504f35f88e44faf5c9c96318c0cca ("ARM: OMAP2+: hwmod:
> Restore sysc after a reset"):
>
> http://marc.info/?l=linux-arm-kernel&m=133410322617245&w=2
>
> Cc: Rajendra Nayak<rnayak@ti•com>
> Signed-off-by: Paul Walmsley<paul@pwsan•com>
> ---
> arch/arm/mach-omap2/omap_hwmod.c | 14 ++++++++++++--
> 1 file changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
> index 45f1d9c..7144ae6 100644
> --- a/arch/arm/mach-omap2/omap_hwmod.c
> +++ b/arch/arm/mach-omap2/omap_hwmod.c
> @@ -1906,10 +1906,20 @@ void omap_hwmod_write(u32 v, struct omap_hwmod *oh, u16 reg_offs)
> */
> int omap_hwmod_softreset(struct omap_hwmod *oh)
> {
> - if (!oh)
> + u32 v;
> + int ret;
> +
> + if (!oh || !(oh->_sysc_cache))
> return -EINVAL;
>
> - return _ocp_softreset(oh);
> + v = oh->_sysc_cache;
> + ret = _set_softreset(oh,&v);
> + if (ret)
> + goto error;
> + _write_sysconfig(v, oh);
> +
> +error:
> + return ret;
> }
>
> /**
next prev parent reply other threads:[~2012-04-13 12:15 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-03-13 17:25 [PATCH v2 0/2] Fixes in hwmod reset code Rajendra Nayak
2012-03-13 17:25 ` [PATCH v2 1/2] ARM: omap: hwmod: Restore sysc after a reset Rajendra Nayak
2012-03-13 17:25 ` [PATCH v2 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status Rajendra Nayak
2012-04-11 0:11 ` Paul Walmsley
2012-04-11 11:06 ` Rajendra Nayak
2012-04-11 18:59 ` Paul Walmsley
2012-04-12 13:05 ` Rajendra Nayak
2012-04-12 17:15 ` Paul Walmsley
2012-04-13 9:26 ` Rajendra Nayak
2012-04-13 10:45 ` Paul Walmsley
2012-04-13 11:22 ` Paul Walmsley
2012-04-13 12:15 ` Rajendra Nayak [this message]
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 14:03 [PATCH v2 0/2] Fixes in hwmod reset code Rajendra Nayak
2012-03-13 14:03 ` [PATCH v2 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status Rajendra Nayak
2012-04-04 15:34 ` 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=4F8818F3.3040803@ti.com \
--to=rnayak@ti$(echo .)com \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox