| Message ID | 1392592544-7884-1-git-send-email-vaibhav.bedia@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); > } > -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 -- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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); }
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(-)