Skip to content

Commit 399721a

Browse files
Revert "[nrf fromlist] soc: nordic: nrf54h20: disallow using LR in s2ram marking function"
This reverts commit 7806677. Signed-off-by: Adam Kondraciuk <[email protected]>
1 parent 95ee962 commit 399721a

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

soc/nordic/nrf54h/pm_s2ram.c

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ void __attribute__((naked)) pm_s2ram_mark_set(void)
185185

186186
bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
187187
{
188-
register uint32_t link_reg __asm__("r14");
189-
190188
__asm__ volatile(
191189
/* Set return value to 0 */
192190
"mov r0, #0\n"
@@ -214,14 +212,13 @@ bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
214212
"mov r0, #1\n"
215213

216214
"exit:\n"
217-
"bx %[link_reg]\n"
215+
"bx lr\n"
218216
:
219217
: [resetinfo_addr] "r"(NRF_RESETINFO),
220218
[resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
221219
[resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
222220
[restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
223-
[restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk),
224-
[link_reg] "r"(link_reg)
221+
[restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
225222

226-
: "r0", "r1", "r3", "r4", "cc", "memory");
223+
: "r0", "r1", "r3", "r4", "memory");
227224
}

0 commit comments

Comments
 (0)