* [PATCH v2 0/2] Fixes in hwmod reset code
@ 2012-03-13 14:03 Rajendra Nayak
2012-03-13 14:03 ` [PATCH v2 1/2] ARM: omap: hwmod: Restore sysc after a reset Rajendra Nayak
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Rajendra Nayak @ 2012-03-13 14:03 UTC (permalink / raw)
To: linux-arm-kernel
This fixes a couple of issues around hwmod reset
APIs'.
Patches are based on 3.3.-rc7.
Rajendra Nayak (2):
ARM: omap: hwmod: Restore sysc after a reset
ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
arch/arm/mach-omap2/omap_hwmod.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread* [PATCH v2 1/2] ARM: omap: hwmod: Restore sysc after a reset
2012-03-13 14:03 [PATCH v2 0/2] Fixes in hwmod reset code Rajendra Nayak
@ 2012-03-13 14:03 ` 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-03-13 14:22 ` [PATCH v2 0/2] Fixes in hwmod reset code Paul Walmsley
2 siblings, 0 replies; 7+ messages in thread
From: Rajendra Nayak @ 2012-03-13 14:03 UTC (permalink / raw)
To: linux-arm-kernel
After a softreset, make sure the sysc settings are correctly
restored.
Reported-by: Anand Gadiyar <gadiyar@ti•com>
Signed-off-by: Rajendra Nayak <rnayak@ti•com>
Cc: Benoit Cousson <b-cousson@ti•com>
Cc: Paul Walmsley <paul@pwsan•com>
Cc: Shubhrajyoti D <shubhrajyoti@ti•com>
---
arch/arm/mach-omap2/omap_hwmod.c | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index eba6cd3..ae56939 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -2270,6 +2270,10 @@ int omap_hwmod_reset(struct omap_hwmod *oh)
spin_lock_irqsave(&oh->_lock, flags);
r = _reset(oh);
+ if (oh->class->sysc) {
+ _update_sysc_cache(oh);
+ _enable_sysc(oh);
+ }
spin_unlock_irqrestore(&oh->_lock, flags);
return r;
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 2/2] ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
2012-03-13 14:03 [PATCH v2 0/2] Fixes in hwmod reset code Rajendra Nayak
2012-03-13 14:03 ` [PATCH v2 1/2] ARM: omap: hwmod: Restore sysc after a reset Rajendra Nayak
@ 2012-03-13 14:03 ` Rajendra Nayak
2012-04-04 15:34 ` Paul Walmsley
2012-03-13 14:22 ` [PATCH v2 0/2] Fixes in hwmod reset code Paul Walmsley
2 siblings, 1 reply; 7+ messages in thread
From: Rajendra Nayak @ 2012-03-13 14:03 UTC (permalink / raw)
To: linux-arm-kernel
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, 2 insertions(+), 12 deletions(-)
diff --git a/arch/arm/mach-omap2/omap_hwmod.c b/arch/arm/mach-omap2/omap_hwmod.c
index ae56939..489f82d 100644
--- a/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@ -1907,20 +1907,10 @@ 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);
-
-error:
- return ret;
+ return _ocp_softreset(oh);
}
/**
--
1.7.1
^ permalink raw reply related [flat|nested] 7+ messages in thread* [PATCH v2 0/2] Fixes in hwmod reset code
2012-03-13 14:03 [PATCH v2 0/2] Fixes in hwmod reset code Rajendra Nayak
2012-03-13 14:03 ` [PATCH v2 1/2] ARM: omap: hwmod: Restore sysc after a reset 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-03-13 14:22 ` Paul Walmsley
2012-03-13 17:24 ` Rajendra Nayak
2 siblings, 1 reply; 7+ messages in thread
From: Paul Walmsley @ 2012-03-13 14:22 UTC (permalink / raw)
To: linux-arm-kernel
Hi Rajendra
On Tue, 13 Mar 2012, Rajendra Nayak wrote:
> This fixes a couple of issues around hwmod reset
> APIs'.
> Patches are based on 3.3.-rc7.
>
> Rajendra Nayak (2):
> ARM: omap: hwmod: Restore sysc after a reset
> ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
>
> arch/arm/mach-omap2/omap_hwmod.c | 18 ++++++------------
> 1 files changed, 6 insertions(+), 12 deletions(-)
Could you base this on either my 'hwmod_code_cleanup_3.4' branch or
'hwmod_enable_remaining_hwmods_devel_3.4' branch? There are some reset
changes in there also.
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 0/2] Fixes in hwmod reset code
2012-03-13 14:22 ` [PATCH v2 0/2] Fixes in hwmod reset code Paul Walmsley
@ 2012-03-13 17:24 ` Rajendra Nayak
0 siblings, 0 replies; 7+ messages in thread
From: Rajendra Nayak @ 2012-03-13 17:24 UTC (permalink / raw)
To: linux-arm-kernel
Hi Paul,
On Tuesday 13 March 2012 07:52 PM, Paul Walmsley wrote:
> Hi Rajendra
>
> On Tue, 13 Mar 2012, Rajendra Nayak wrote:
>
>> This fixes a couple of issues around hwmod reset
>> APIs'.
>> Patches are based on 3.3.-rc7.
>>
>> Rajendra Nayak (2):
>> ARM: omap: hwmod: Restore sysc after a reset
>> ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
>>
>> arch/arm/mach-omap2/omap_hwmod.c | 18 ++++++------------
>> 1 files changed, 6 insertions(+), 12 deletions(-)
>
> Could you base this on either my 'hwmod_code_cleanup_3.4' branch or
> 'hwmod_enable_remaining_hwmods_devel_3.4' branch? There are some reset
> changes in there also.
Sure, will send them out shortly.
regards,
Rajendra
>
>
> - Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v2 0/2] Fixes in hwmod reset code
@ 2012-03-13 17:25 Rajendra Nayak
0 siblings, 0 replies; 7+ messages in thread
From: Rajendra Nayak @ 2012-03-13 17:25 UTC (permalink / raw)
To: linux-arm-kernel
This fixes a couple of issues around hwmod reset
APIs'.
Patches are based on 'hwmod_enable_remaining_hwmods_devel_3.4'
of git://git.pwsan.com/linux-2.6
Rajendra Nayak (2):
ARM: omap: hwmod: Restore sysc after a reset
ARM: omap: hwmod: Make omap_hwmod_softreset wait for reset status
arch/arm/mach-omap2/omap_hwmod.c | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-04-04 15:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-03-13 14:03 [PATCH v2 0/2] Fixes in hwmod reset code Rajendra Nayak
2012-03-13 14:03 ` [PATCH v2 1/2] ARM: omap: hwmod: Restore sysc after a reset 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
2012-03-13 14:22 ` [PATCH v2 0/2] Fixes in hwmod reset code Paul Walmsley
2012-03-13 17:24 ` Rajendra Nayak
-- strict thread matches above, loose matches on Subject: below --
2012-03-13 17:25 Rajendra Nayak
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox