* [PATCH 1/1] ARM: OMAP5: Fix reboot handling
@ 2014-02-16 23:15 Vaibhav Bedia
2014-02-17 4:40 ` Lokesh Vutla
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Vaibhav Bedia @ 2014-02-16 23:15 UTC (permalink / raw)
To: linux-arm-kernel
Use the correct register offset for issuing the
reset command in OMAP5. Since dev_inst is set dynamically
OMAP4 should not be affected by this change.
Signed-off-by: Vaibhav Bedia <vaibhav.bedia@gmail.com>
---
Applies on top of v3.14-rc3
arch/arm/mach-omap2/prminst44xx.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c
index 6334b96..280f3c5 100644
--- a/arch/arm/mach-omap2/prminst44xx.c
+++ b/arch/arm/mach-omap2/prminst44xx.c
@@ -183,11 +183,11 @@ void omap4_prminst_global_warm_sw_reset(void)
OMAP4_PRM_RSTCTRL_OFFSET);
v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK;
omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION,
- OMAP4430_PRM_DEVICE_INST,
+ dev_inst,
OMAP4_PRM_RSTCTRL_OFFSET);
/* OCP barrier */
v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
- OMAP4430_PRM_DEVICE_INST,
+ dev_inst,
OMAP4_PRM_RSTCTRL_OFFSET);
}
--
1.8.1.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* [PATCH 1/1] ARM: OMAP5: Fix reboot handling
2014-02-16 23:15 [PATCH 1/1] ARM: OMAP5: Fix reboot handling Vaibhav Bedia
@ 2014-02-17 4:40 ` Lokesh Vutla
2014-02-17 6:58 ` Rajendra Nayak
2014-02-19 17:39 ` Paul Walmsley
2 siblings, 0 replies; 5+ messages in thread
From: Lokesh Vutla @ 2014-02-17 4:40 UTC (permalink / raw)
To: linux-arm-kernel
Hi Vaibhav,
On Monday 17 February 2014 04:45 AM, Vaibhav Bedia wrote:
> Use the correct register offset for issuing the
> reset command in OMAP5. Since dev_inst is set dynamically
> OMAP4 should not be affected by this change.
Thanks for the patch. This fixes reboot on OMAP5 and DRA7 also..:)
Tested-by: Lokesh Vutla <lokeshvutla@ti.com>
Thanks and regards,
Lokesh
>
> Signed-off-by: Vaibhav Bedia <vaibhav.bedia@gmail.com>
> ---
> Applies on top of v3.14-rc3
>
> arch/arm/mach-omap2/prminst44xx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c
> index 6334b96..280f3c5 100644
> --- a/arch/arm/mach-omap2/prminst44xx.c
> +++ b/arch/arm/mach-omap2/prminst44xx.c
> @@ -183,11 +183,11 @@ void omap4_prminst_global_warm_sw_reset(void)
> OMAP4_PRM_RSTCTRL_OFFSET);
> v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK;
> omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION,
> - OMAP4430_PRM_DEVICE_INST,
> + dev_inst,
> OMAP4_PRM_RSTCTRL_OFFSET);
>
> /* OCP barrier */
> v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
> - OMAP4430_PRM_DEVICE_INST,
> + dev_inst,
> OMAP4_PRM_RSTCTRL_OFFSET);
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] ARM: OMAP5: Fix reboot handling
2014-02-16 23:15 [PATCH 1/1] ARM: OMAP5: Fix reboot handling Vaibhav Bedia
2014-02-17 4:40 ` Lokesh Vutla
@ 2014-02-17 6:58 ` Rajendra Nayak
2014-02-19 17:39 ` Paul Walmsley
2 siblings, 0 replies; 5+ messages in thread
From: Rajendra Nayak @ 2014-02-17 6:58 UTC (permalink / raw)
To: linux-arm-kernel
On Monday 17 February 2014 04:45 AM, Vaibhav Bedia wrote:
> Use the correct register offset for issuing the
> reset command in OMAP5. Since dev_inst is set dynamically
> OMAP4 should not be affected by this change.
>
> Signed-off-by: Vaibhav Bedia <vaibhav.bedia@gmail.com>
Acked-by: Rajendra Nayak <rnayak@ti.com>
> ---
> Applies on top of v3.14-rc3
>
> arch/arm/mach-omap2/prminst44xx.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-omap2/prminst44xx.c b/arch/arm/mach-omap2/prminst44xx.c
> index 6334b96..280f3c5 100644
> --- a/arch/arm/mach-omap2/prminst44xx.c
> +++ b/arch/arm/mach-omap2/prminst44xx.c
> @@ -183,11 +183,11 @@ void omap4_prminst_global_warm_sw_reset(void)
> OMAP4_PRM_RSTCTRL_OFFSET);
> v |= OMAP4430_RST_GLOBAL_WARM_SW_MASK;
> omap4_prminst_write_inst_reg(v, OMAP4430_PRM_PARTITION,
> - OMAP4430_PRM_DEVICE_INST,
> + dev_inst,
> OMAP4_PRM_RSTCTRL_OFFSET);
>
> /* OCP barrier */
> v = omap4_prminst_read_inst_reg(OMAP4430_PRM_PARTITION,
> - OMAP4430_PRM_DEVICE_INST,
> + dev_inst,
> OMAP4_PRM_RSTCTRL_OFFSET);
> }
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] ARM: OMAP5: Fix reboot handling
2014-02-16 23:15 [PATCH 1/1] ARM: OMAP5: Fix reboot handling Vaibhav Bedia
2014-02-17 4:40 ` Lokesh Vutla
2014-02-17 6:58 ` Rajendra Nayak
@ 2014-02-19 17:39 ` Paul Walmsley
2014-02-19 17:44 ` Paul Walmsley
2 siblings, 1 reply; 5+ messages in thread
From: Paul Walmsley @ 2014-02-19 17:39 UTC (permalink / raw)
To: linux-arm-kernel
On Sun, 16 Feb 2014, Vaibhav Bedia wrote:
> Use the correct register offset for issuing the
> reset command in OMAP5. Since dev_inst is set dynamically
> OMAP4 should not be affected by this change.
>
> Signed-off-by: Vaibhav Bedia <vaibhav.bedia@gmail.com>
Thanks, queued for v3.14-rc with Lokesh's Tested-by:.
- Paul
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/1] ARM: OMAP5: Fix reboot handling
2014-02-19 17:39 ` Paul Walmsley
@ 2014-02-19 17:44 ` Paul Walmsley
0 siblings, 0 replies; 5+ messages in thread
From: Paul Walmsley @ 2014-02-19 17:44 UTC (permalink / raw)
To: linux-arm-kernel
On Wed, 19 Feb 2014, Paul Walmsley wrote:
> On Sun, 16 Feb 2014, Vaibhav Bedia wrote:
>
> > Use the correct register offset for issuing the
> > reset command in OMAP5. Since dev_inst is set dynamically
> > OMAP4 should not be affected by this change.
> >
> > Signed-off-by: Vaibhav Bedia <vaibhav.bedia@gmail.com>
>
> Thanks, queued for v3.14-rc with Lokesh's Tested-by:.
(and Rajendra's ack also)
- Paul
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-02-19 17:44 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-02-16 23:15 [PATCH 1/1] ARM: OMAP5: Fix reboot handling Vaibhav Bedia
2014-02-17 4:40 ` Lokesh Vutla
2014-02-17 6:58 ` Rajendra Nayak
2014-02-19 17:39 ` Paul Walmsley
2014-02-19 17:44 ` 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).