Skip to content

Commit 759e07b

Browse files
nashifcarlescufi
authored andcommitted
intel_adsp: move memory window setup to PRE_KERNEL_1
PRE_KERNEL_1 is more suited for dealing with devices, so move out of EARLY. Verified on hardware and things seem to behave the same. Something was changed since this was first introduced as this was not possible for some reason. Fixes zephyrproject-rtos#62627 Signed-off-by: Anas Nashif <[email protected]>
1 parent 49df14c commit 759e07b

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/console/winstream_console.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ static int winstream_console_init(void)
6262
return 0;
6363
}
6464

65-
SYS_INIT(winstream_console_init, EARLY, CONFIG_CONSOLE_INIT_PRIORITY);
65+
SYS_INIT(winstream_console_init, PRE_KERNEL_1, CONFIG_CONSOLE_INIT_PRIORITY);

soc/xtensa/intel_adsp/common/mem_window.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,9 @@ void mem_window_idle_exit(void)
5454
.mem_base = DT_REG_ADDR(DT_PHANDLE(MEM_WINDOW_NODE(n), memory)) + WIN_OFFSET(n), \
5555
.initialize = DT_PROP(MEM_WINDOW_NODE(n), initialize), \
5656
}; \
57-
DEVICE_DT_DEFINE(MEM_WINDOW_NODE(n), mem_win_init, NULL, NULL, &mem_win_config_##n, EARLY, \
58-
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
57+
DEVICE_DT_DEFINE(MEM_WINDOW_NODE(n), mem_win_init, NULL, NULL, \
58+
&mem_win_config_##n, PRE_KERNEL_1, \
59+
CONFIG_KERNEL_INIT_PRIORITY_DEFAULT, NULL);
5960

6061
#if DT_NODE_HAS_STATUS(MEM_WINDOW_NODE(0), okay)
6162
MEM_WINDOW_DEFINE(0)

0 commit comments

Comments
 (0)