Skip to content

Commit 0d8fc2f

Browse files
Revert "[nrf fromlist] soc: nordic: nrf54h20: disallow using LR in s2ram marking function"
This reverts commit 269aa0f.
1 parent 1aa2f9d commit 0d8fc2f

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
@@ -132,8 +132,6 @@ void __attribute__((naked)) pm_s2ram_mark_set(void)
132132

133133
bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
134134
{
135-
register uint32_t link_reg __asm__("r14");
136-
137135
__asm__ volatile(
138136
/* Set return value to 0 */
139137
"mov r0, #0\n"
@@ -161,14 +159,13 @@ bool __attribute__((naked)) pm_s2ram_mark_check_and_clear(void)
161159
"mov r0, #1\n"
162160

163161
"exit:\n"
164-
"bx %[link_reg]\n"
162+
"bx lr\n"
165163
:
166164
: [resetinfo_addr] "r"(NRF_RESETINFO),
167165
[resetreas_offs] "r"(offsetof(NRF_RESETINFO_Type, RESETREAS.LOCAL)),
168166
[resetreas_unretained_mask] "r"(NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK),
169167
[restorevalid_offs] "r"(offsetof(NRF_RESETINFO_Type, RESTOREVALID)),
170-
[restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk),
171-
[link_reg] "r"(link_reg)
168+
[restorevalid_present_mask] "r"(RESETINFO_RESTOREVALID_RESTOREVALID_Msk)
172169

173-
: "r0", "r1", "r3", "r4", "cc", "memory");
170+
: "r0", "r1", "r3", "r4", "memory");
174171
}

0 commit comments

Comments
 (0)