* [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources
@ 2012-12-17 19:53 Ivan Khoronzhuk
0 siblings, 0 replies; 7+ messages in thread
From: Ivan Khoronzhuk @ 2012-12-17 19:53 UTC (permalink / raw)
To: linux-omap
Cc: linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren,
Ivan Khoronzhuk
To read reset sources registers we have to use PRM_DEVICE_INST
---
arch/arm/mach-omap2/prm44xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 7498bc7..0b61b8d 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -333,7 +333,7 @@ static u32 omap44xx_prm_read_reset_sources(void)
u32 r = 0;
u32 v;
- v = omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
+ v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
OMAP4_RM_RSTST);
p = omap44xx_prm_reset_src_map;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] ARM: OMAP4: PRM: Correct reset source map
@ 2012-12-19 10:06 Ivan Khoronzhuk
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources Ivan Khoronzhuk
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Ivan Khoronzhuk @ 2012-12-19 10:06 UTC (permalink / raw)
To: linux-omap
Cc: linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren,
Ivan Khoronzhuk
In the map for reset sources register we use defines intended for
using with PRM_RSTCTRL register. So fix it.
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
arch/arm/mach-omap2/prm44xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 7498bc7..e335216 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -56,9 +56,9 @@ static struct omap_prcm_irq_setup omap4_prcm_irq_setup = {
* enumeration)
*/
static struct prm_reset_src_map omap44xx_prm_reset_src_map[] = {
- { OMAP4430_RST_GLOBAL_WARM_SW_SHIFT,
+ { OMAP4430_GLOBAL_WARM_SW_RST_SHIFT,
OMAP_GLOBAL_WARM_RST_SRC_ID_SHIFT },
- { OMAP4430_RST_GLOBAL_COLD_SW_SHIFT,
+ { OMAP4430_GLOBAL_COLD_RST_SHIFT,
OMAP_GLOBAL_COLD_RST_SRC_ID_SHIFT },
{ OMAP4430_MPU_SECURITY_VIOL_RST_SHIFT,
OMAP_SECU_VIOL_RST_SRC_ID_SHIFT },
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources
2012-12-19 10:06 [PATCH] ARM: OMAP4: PRM: Correct reset source map Ivan Khoronzhuk
@ 2012-12-19 10:06 ` Ivan Khoronzhuk
2012-12-19 16:57 ` Paul Walmsley
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets Ivan Khoronzhuk
2012-12-19 16:57 ` [PATCH] ARM: OMAP4: PRM: Correct reset source map Paul Walmsley
2 siblings, 1 reply; 7+ messages in thread
From: Ivan Khoronzhuk @ 2012-12-19 10:06 UTC (permalink / raw)
To: linux-omap
Cc: linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren,
Ivan Khoronzhuk
To read reset sources registers we have to use PRM_DEVICE_INST
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
arch/arm/mach-omap2/prm44xx.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm/mach-omap2/prm44xx.c b/arch/arm/mach-omap2/prm44xx.c
index 7498bc7..0b61b8d 100644
--- a/arch/arm/mach-omap2/prm44xx.c
+++ b/arch/arm/mach-omap2/prm44xx.c
@@ -333,7 +333,7 @@ static u32 omap44xx_prm_read_reset_sources(void)
u32 r = 0;
u32 v;
- v = omap4_prm_read_inst_reg(OMAP4430_PRM_OCP_SOCKET_INST,
+ v = omap4_prm_read_inst_reg(OMAP4430_PRM_DEVICE_INST,
OMAP4_RM_RSTST);
p = omap44xx_prm_reset_src_map;
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH] ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets
2012-12-19 10:06 [PATCH] ARM: OMAP4: PRM: Correct reset source map Ivan Khoronzhuk
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources Ivan Khoronzhuk
@ 2012-12-19 10:06 ` Ivan Khoronzhuk
2012-12-19 16:57 ` Paul Walmsley
2012-12-19 16:57 ` [PATCH] ARM: OMAP4: PRM: Correct reset source map Paul Walmsley
2 siblings, 1 reply; 7+ messages in thread
From: Ivan Khoronzhuk @ 2012-12-19 10:06 UTC (permalink / raw)
To: linux-omap
Cc: linux-kernel, linux-arm-kernel, Russell King, Tony Lindgren,
Nishanth Menon, Ivan Khoronzhuk
From: Nishanth Menon <nm@ti.com>
RSTTIME is offset 0x8 and RSTST is offset 0x04 for OMAP4430 and
OMAP4460.
Signed-off-by: Nishanth Menon <nm@ti.com>
[ivan.khoronzhuk@ti.com: ported from k3.4]
Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
---
arch/arm/mach-omap2/prm44xx.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prm44xx.h b/arch/arm/mach-omap2/prm44xx.h
index 22b0979..8ee1fbd 100644
--- a/arch/arm/mach-omap2/prm44xx.h
+++ b/arch/arm/mach-omap2/prm44xx.h
@@ -62,8 +62,8 @@
/* OMAP4 specific register offsets */
#define OMAP4_RM_RSTCTRL 0x0000
-#define OMAP4_RM_RSTTIME 0x0004
-#define OMAP4_RM_RSTST 0x0008
+#define OMAP4_RM_RSTST 0x0004
+#define OMAP4_RM_RSTTIME 0x0008
#define OMAP4_PM_PWSTCTRL 0x0000
#define OMAP4_PM_PWSTST 0x0004
--
1.7.9.5
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: OMAP4: PRM: Correct reset source map
2012-12-19 10:06 [PATCH] ARM: OMAP4: PRM: Correct reset source map Ivan Khoronzhuk
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources Ivan Khoronzhuk
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets Ivan Khoronzhuk
@ 2012-12-19 16:57 ` Paul Walmsley
2 siblings, 0 replies; 7+ messages in thread
From: Paul Walmsley @ 2012-12-19 16:57 UTC (permalink / raw)
To: Ivan Khoronzhuk
Cc: linux-omap, linux-kernel, linux-arm-kernel, Russell King,
Tony Lindgren
On Wed, 19 Dec 2012, Ivan Khoronzhuk wrote:
> In the map for reset sources register we use defines intended for
> using with PRM_RSTCTRL register. So fix it.
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Thanks, queued for v3.8-rc fixes.
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets Ivan Khoronzhuk
@ 2012-12-19 16:57 ` Paul Walmsley
0 siblings, 0 replies; 7+ messages in thread
From: Paul Walmsley @ 2012-12-19 16:57 UTC (permalink / raw)
To: Ivan Khoronzhuk
Cc: linux-omap, linux-kernel, linux-arm-kernel, Russell King,
Tony Lindgren, Nishanth Menon
On Wed, 19 Dec 2012, Ivan Khoronzhuk wrote:
> From: Nishanth Menon <nm@ti.com>
>
> RSTTIME is offset 0x8 and RSTST is offset 0x04 for OMAP4430 and
> OMAP4460.
>
> Signed-off-by: Nishanth Menon <nm@ti.com>
> [ivan.khoronzhuk@ti.com: ported from k3.4]
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Thanks guys, queued for v3.8-rc fixes.
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources Ivan Khoronzhuk
@ 2012-12-19 16:57 ` Paul Walmsley
0 siblings, 0 replies; 7+ messages in thread
From: Paul Walmsley @ 2012-12-19 16:57 UTC (permalink / raw)
To: Ivan Khoronzhuk
Cc: linux-omap, linux-kernel, linux-arm-kernel, Russell King,
Tony Lindgren
On Wed, 19 Dec 2012, Ivan Khoronzhuk wrote:
> To read reset sources registers we have to use PRM_DEVICE_INST
>
> Signed-off-by: Ivan Khoronzhuk <ivan.khoronzhuk@ti.com>
Thanks, queued for v3.8-rc fixes.
- Paul
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2012-12-19 16:57 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-19 10:06 [PATCH] ARM: OMAP4: PRM: Correct reset source map Ivan Khoronzhuk
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources Ivan Khoronzhuk
2012-12-19 16:57 ` Paul Walmsley
2012-12-19 10:06 ` [PATCH] ARM: OMAP4: PRM: fix RSTTIME and RSTST offsets Ivan Khoronzhuk
2012-12-19 16:57 ` Paul Walmsley
2012-12-19 16:57 ` [PATCH] ARM: OMAP4: PRM: Correct reset source map Paul Walmsley
-- strict thread matches above, loose matches on Subject: below --
2012-12-17 19:53 [PATCH] ARM: OMAP4: PRM: Correct wrong instance usage for reading reset sources Ivan Khoronzhuk
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox