Skip to content

Commit 3d1efc2

Browse files
[nrf fromlist] soc: nordic: nrf54h: Add support for nRF54H20 EngB
Guards for nRF54H20 CPURAD should include EngB as well. So the symbol `CONFIG_SOC_NRF54H20_CPURAD` is replaced with the generic `NRF_RADIOCORE` Upstream PR #: 82225 Signed-off-by: Adam Kondraciuk <[email protected]>
1 parent 2a2a67b commit 3d1efc2

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

soc/nordic/nrf54h/power.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ void nrf_poweroff(void)
6262
nrf_resetinfo_resetreas_local_set(NRF_RESETINFO, 0);
6363
nrf_resetinfo_restore_valid_set(NRF_RESETINFO, false);
6464

65-
#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
65+
#if !defined(NRF_RADIOCORE)
6666
/* Disable retention */
6767
nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_MAIN, false);
6868
nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
@@ -88,7 +88,7 @@ static void s2idle_enter(uint8_t substate_id)
8888
case 1: /* Substate for idle with cache retained - not implemented yet. */
8989
break;
9090
case 2: /* Substate for idle with cache disabled. */
91-
#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
91+
#if !defined(NRF_RADIOCORE)
9292
soc_lrcconf_poweron_request(&soc_node, NRF_LRCCONF_POWER_MAIN);
9393
#endif
9494
common_suspend();
@@ -113,7 +113,7 @@ static void s2idle_exit(uint8_t substate_id)
113113
break;
114114
case 2: /* Substate for idle with cache disabled. */
115115
common_resume();
116-
#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
116+
#if !defined(NRF_RADIOCORE)
117117
soc_lrcconf_poweron_release(&soc_node, NRF_LRCCONF_POWER_MAIN);
118118
#endif
119119
default: /* Unknown substate. */
@@ -126,7 +126,7 @@ static void s2idle_exit(uint8_t substate_id)
126126
static void s2ram_exit(void)
127127
{
128128
common_resume();
129-
#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
129+
#if !defined(NRF_RADIOCORE)
130130
/* Re-enable domain retention. */
131131
nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, true);
132132
#endif
@@ -142,7 +142,7 @@ static int sys_suspend_to_ram(void)
142142
NRF_RESETINFO_RESETREAS_LOCAL_UNRETAINED_MASK);
143143
nrf_resetinfo_restore_valid_set(NRF_RESETINFO, true);
144144

145-
#if !defined(CONFIG_SOC_NRF54H20_CPURAD)
145+
#if !defined(NRF_RADIOCORE)
146146
/* Disable retention */
147147
nrf_lrcconf_retain_set(NRF_LRCCONF010, NRF_LRCCONF_POWER_DOMAIN_0, false);
148148
#endif

0 commit comments

Comments
 (0)