soc: intel: move init code from SYS_INIT to hooks

Replace SYS_INIT with SoC hooks and adapt SoC init code

Signed-off-by: Anas Nashif <[email protected]>

Author: nashif

soc/intel/intel_adsp/ace/Kconfig

@@ -15,6 +15,8 @@ config SOC_SERIES_INTEL_ADSP_ACE
 	select XTENSA_CPU_HAS_HIFI3
 	select XTENSA_CPU_HAS_HIFI4
 	select ARCH_HAS_RESERVED_PAGE_FRAMES if MMU
+	select SOC_LATE_INIT_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_INTEL_COMM_WIDGET
 	bool "Intel Communication Widget driver"

soc/intel/intel_adsp/ace/multiprocessing.c

@@ -108,11 +108,11 @@ void soc_mp_init(void)
 	soc_cpus_active[0] = true;
 }
 
-static int host_runtime_get(void)
+void soc_late_init_hook(void)
 {
-	return pm_device_runtime_get(INTEL_ADSP_HST_DOMAIN_DEV);
+	pm_device_runtime_get(INTEL_ADSP_HST_DOMAIN_DEV);
 }
-SYS_INIT(host_runtime_get, POST_KERNEL, 99);
+
 
 #ifdef CONFIG_ADSP_IMR_CONTEXT_SAVE
 /*

soc/intel/intel_adsp/cavs/Kconfig

@@ -11,6 +11,7 @@ config SOC_SERIES_INTEL_ADSP_CAVS
 	select ATOMIC_OPERATIONS_ARCH if "$(ZEPHYR_TOOLCHAIN_VARIANT)" = "xcc"
 	select ARCH_HAS_COHERENCE
 	select HAS_PM
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_INTEL_CAVS_V25
 	select XTENSA_WAITI_BUG

soc/intel/intel_adsp/common/boot_complete.c

@@ -28,5 +28,3 @@ int boot_complete(void)
 
 	return 0;
 }
-
-SYS_INIT(boot_complete, PRE_KERNEL_1, CONFIG_KERNEL_INIT_PRIORITY_DEVICE);

soc/intel/intel_adsp/common/soc.c

@@ -6,15 +6,17 @@
 #include <zephyr/init.h>
 #include <zephyr/linker/section_tags.h>
 
+extern int boot_complete(void);
 extern void power_init(void);
 extern void adsp_clock_init(void);
 
 #if CONFIG_MP_MAX_NUM_CPUS > 1
 extern void soc_mp_init(void);
 #endif
 
-static __imr int soc_init(void)
+void soc_early_init_hook(void)
 {
+	(void)boot_complete();
 	power_init();
 
 #ifdef CONFIG_ADSP_CLOCK
@@ -24,8 +26,4 @@ static __imr int soc_init(void)
 #if CONFIG_MP_MAX_NUM_CPUS > 1
 	soc_mp_init();
 #endif
-
-	return 0;
 }
-
-SYS_INIT(soc_init, PRE_KERNEL_1, 99);

soc/intel/intel_ish/Kconfig

@@ -13,3 +13,4 @@ config SOC_FAMILY_INTEL_ISH
 	select INTEL_HAL
 	select HAS_PM
 	select HAS_COVERAGE_SUPPORT
+	select SOC_EARLY_INIT_HOOK

soc/intel/intel_ish/intel_ish5/pm/power.c

@@ -72,11 +72,7 @@ void sys_arch_reboot(int type)
 
 extern void sedi_pm_init(void);
 
-static int ish_sedi_pm_init(void)
+void soc_early_init_hook(void)
 {
 	sedi_pm_init();
-
-	return 0;
 }
-
-SYS_INIT(ish_sedi_pm_init, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

soc/intel/intel_ish/intel_ish5/soc.c

@@ -11,13 +11,9 @@
 #include "sedi_driver_hpet.h"
 #endif
 
-static int intel_ish_init(void)
+void soc_early_init_hook(void)
 {
 #if defined(CONFIG_HPET_TIMER)
 	sedi_hpet_set_min_delay(HPET_CMP_MIN_DELAY);
 #endif
-
-	return 0;
 }
-
-SYS_INIT(intel_ish_init, PRE_KERNEL_2, CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);

soc/intel/intel_socfpga_std/cyclonev/Kconfig

@@ -7,3 +7,4 @@ config SOC_SERIES_CYCLONEV
 	select ARM_AARCH32_MMU
 	select ARM_ARCH_TIMER_ERRATUM_740657 if ARM_ARCH_TIMER
 	select ARCH_HAS_RESERVED_PAGE_FRAMES
+	select SOC_EARLY_INIT_HOOK

soc/intel/intel_socfpga_std/cyclonev/soc.c

@@ -70,16 +70,12 @@ const struct arm_mmu_config mmu_config = {
  *
  * @return 0
  */
-static int soc_intel_cyclonev_init(void)
+void soc_early_init_hook(void)
 {
 	unsigned int sctlr = __get_SCTLR(); /* modifying some registers prior to initialization */
 
 	sctlr &= ~SCTLR_A_Msk;
 	__set_SCTLR(sctlr);
 	__set_VBAR(0);
-	return 0;
 }
-
-SYS_INIT(soc_intel_cyclonev_init, PRE_KERNEL_1,
-	CONFIG_KERNEL_INIT_PRIORITY_DEFAULT);
 /* EOF */