Skip to contentSkip to conversation

ARM: OMAP5: Fix reboot handling

PATCH New Vaibhav Bedia 4 participants 5 messages Feb 16, 2014 – Feb 19, 2014

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: OMAP5: Fix reboot handling

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.

---
Applies on top of v3.14-rc3

 arch/arm/mach-omap2/prminst44xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/prminst44xx.c +2 -2
index 6334b96..280f3c5 100644
@@ -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);
 }
Signature · 1 line
1.8.1.2
#1 lore raw

PATCH 1/1 ARM: OMAP5: Fix reboot handling

Hi Vaibhav,

Quoted 3 lines · Vaibhav Bedia

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..:)

Thanks and regards,
Lokesh

Quoted 27 lines

---
Applies on top of v3.14-rc3

 arch/arm/mach-omap2/prminst44xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/prminst44xx.c +2 -2
index 6334b96..280f3c5 100644
@@ -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);
 }
#2 lore raw

PATCH 1/1 ARM: OMAP5: Fix reboot handling

In reply to Vaibhav Bedia
Quoted 5 lines · Vaibhav Bedia

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.

Quoted 25 lines

---
Applies on top of v3.14-rc3

 arch/arm/mach-omap2/prminst44xx.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
arch/arm/mach-omap2/prminst44xx.c +2 -2
index 6334b96..280f3c5 100644
@@ -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);
 }
maintainer
#3 lore raw

PATCH 1/1 ARM: OMAP5: Fix reboot handling

In reply to Vaibhav Bedia
Quoted 5 lines · Vaibhav Bedia

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, queued for v3.14-rc with Lokesh's Tested-by:.

- Paul

maintainer
#4 lore raw

PATCH 1/1 ARM: OMAP5: Fix reboot handling

Quoted 9 lines · Paul Walmsley
Quoted 5 lines · Vaibhav Bedia

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, queued for v3.14-rc with Lokesh's Tested-by:.

(and Rajendra's ack also)

- Paul