* [PATCH 1/2] ARM: OMAP3: PRCM: Fix incorrect read of reset sources
@ 2012-12-17 17:26 Ivan Khoronzhuk
2012-12-17 17:26 ` [PATCH 2/2] ARM: OMAP4: " Ivan Khoronzhuk
2012-12-17 18:24 ` [PATCH 1/2] ARM: OMAP3: " Paul Walmsley
0 siblings, 2 replies; 4+ messages in thread
From: Ivan Khoronzhuk @ 2012-12-17 17:26 UTC (permalink / raw)
To: linux-omap
Cc: linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren,
Ivan Khoronzhuk
The flag mask are incorrect, so fix it.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
arch/arm/mach-omap2/prcm.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index 0f51e03..dc45156 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -48,9 +48,10 @@ void __iomem *prcm_mpu_base;
u32 omap_prcm_get_reset_sources(void)
{
- /* XXX This presumably needs modification for 34XX */
- if (cpu_is_omap24xx() || cpu_is_omap34xx())
+ if (cpu_is_omap24xx())
return omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7f;
+ if (cpu_is_omap34xx())
+ return omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7ff;
if (cpu_is_omap44xx())
return omap2_prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 2/2] ARM: OMAP4: PRCM: Fix incorrect read of reset sources
2012-12-17 17:26 [PATCH 1/2] ARM: OMAP3: PRCM: Fix incorrect read of reset sources Ivan Khoronzhuk
@ 2012-12-17 17:26 ` Ivan Khoronzhuk
2012-12-17 18:24 ` Paul Walmsley
2012-12-17 18:24 ` [PATCH 1/2] ARM: OMAP3: " Paul Walmsley
1 sibling, 1 reply; 4+ messages in thread
From: Ivan Khoronzhuk @ 2012-12-17 17:26 UTC (permalink / raw)
To: linux-omap
Cc: linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren,
Ivan Khoronzhuk
The address of PRM_RSTST register and flag mask are incorrect,
so fix it.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
arch/arm/mach-omap2/prcm.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prcm.c b/arch/arm/mach-omap2/prcm.c
index dc45156..02f27f2 100644
--- a/arch/arm/mach-omap2/prcm.c
+++ b/arch/arm/mach-omap2/prcm.c
@@ -53,8 +53,8 @@ u32 omap_prcm_get_reset_sources(void)
if (cpu_is_omap34xx())
return omap2_prm_read_mod_reg(WKUP_MOD, OMAP2_RM_RSTST) & 0x7ff;
if (cpu_is_omap44xx())
- return omap2_prm_read_mod_reg(WKUP_MOD, OMAP4_RM_RSTST) & 0x7f;
-
+ return omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
+ OMAP4_PRM_RSTST_OFFSET) & 0x7ff;
return 0;
}
EXPORT_SYMBOL(omap_prcm_get_reset_sources);
--
1.7.9.5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 1/2] ARM: OMAP3: PRCM: Fix incorrect read of reset sources
2012-12-17 17:26 [PATCH 1/2] ARM: OMAP3: PRCM: Fix incorrect read of reset sources Ivan Khoronzhuk
2012-12-17 17:26 ` [PATCH 2/2] ARM: OMAP4: " Ivan Khoronzhuk
@ 2012-12-17 18:24 ` Paul Walmsley
1 sibling, 0 replies; 4+ messages in thread
From: Paul Walmsley @ 2012-12-17 18:24 UTC (permalink / raw)
To: Ivan Khoronzhuk
Cc: linux-omap, linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren
Hi
On Mon, 17 Dec 2012, Ivan Khoronzhuk wrote:
> The flag mask are incorrect, so fix it.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
arch/arm/mach-omap2/prcm.c no longer exists in current mainline; please
rebase this against Linus' current tree.
- Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH 2/2] ARM: OMAP4: PRCM: Fix incorrect read of reset sources
2012-12-17 17:26 ` [PATCH 2/2] ARM: OMAP4: " Ivan Khoronzhuk
@ 2012-12-17 18:24 ` Paul Walmsley
0 siblings, 0 replies; 4+ messages in thread
From: Paul Walmsley @ 2012-12-17 18:24 UTC (permalink / raw)
To: Ivan Khoronzhuk
Cc: linux-omap, linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren
Hi
On Mon, 17 Dec 2012, Ivan Khoronzhuk wrote:
> The address of PRM_RSTST register and flag mask are incorrect,
> so fix it.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
arch/arm/mach-omap2/prcm.c no longer exists in current mainline; please
rebase this against Linus' current tree.
- Paul
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-12-17 18:24 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-12-17 17:26 [PATCH 1/2] ARM: OMAP3: PRCM: Fix incorrect read of reset sources Ivan Khoronzhuk
2012-12-17 17:26 ` [PATCH 2/2] ARM: OMAP4: " Ivan Khoronzhuk
2012-12-17 18:24 ` Paul Walmsley
2012-12-17 18:24 ` [PATCH 1/2] ARM: OMAP3: " Paul Walmsley
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).