[nrf fromtree] soc: nxp: 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]>
(cherry picked from commit f519f00)

Author: nashif

soc/nxp/imx/imx6sx/Kconfig

@@ -9,6 +9,7 @@ config SOC_SERIES_IMX6SX
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
 	select CLOCK_CONTROL
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MCIMX6X_M4
 	select HAS_IMX_HAL

soc/nxp/imx/imx6sx/soc.c

@@ -287,7 +287,7 @@ static void SOC_ClockInit(void)
  *
  * @return 0
  */
-static int mcimx6x_m4_init(void)
+void soc_early_init_hook(void)
 {
 	/* Configure RDC */
 	SOC_RdcInit();
@@ -300,8 +300,4 @@ static int mcimx6x_m4_init(void)
 
 	/* Initialize clock */
 	SOC_ClockInit();
-
-	return 0;
 }
-
-SYS_INIT(mcimx6x_m4_init, PRE_KERNEL_1, 0);

soc/nxp/imx/imx7d/Kconfig

@@ -8,6 +8,7 @@ config SOC_SERIES_IMX7D
 	select CLOCK_CONTROL
 	select CPU_HAS_FPU
 	select CPU_HAS_ARM_MPU
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MCIMX7D_M4
 	select HAS_IMX_HAL

soc/nxp/imx/imx7d/soc.c

@@ -222,7 +222,7 @@ static void nxp_mcimx7_mu_config(void)
 }
 #endif /* CONFIG_IPM_IMX */
 
-static int nxp_mcimx7_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
@@ -250,8 +250,4 @@ static int nxp_mcimx7_init(void)
 #ifdef CONFIG_IPM_IMX
 	nxp_mcimx7_mu_config();
 #endif /* CONFIG_IPM_IMX */
-
-	return 0;
 }
-
-SYS_INIT(nxp_mcimx7_init, PRE_KERNEL_1, 0);

soc/nxp/imx/imx8m/Kconfig

@@ -10,6 +10,7 @@ config SOC_MIMX8MM6_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
+	select SOC_PREP_HOOK
 
 config SOC_MIMX8MM6_M4
 	select ARM
@@ -21,6 +22,7 @@ config SOC_MIMX8MM6_M4
 	select HAS_MCUX_RDC
 	select HAS_MCUX_IGPIO
 	select HAS_MCUX_IOMUXC
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMX8ML8_A53
 	select ARM64
@@ -31,6 +33,7 @@ config SOC_MIMX8ML8_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
+	select SOC_PREP_HOOK
 
 config SOC_MIMX8MN6_A53
 	select ARM64
@@ -41,6 +44,7 @@ config SOC_MIMX8MN6_A53
 	select HAS_MCUX_IOMUXC if PINCTRL
 	select HAS_MCUX_RDC
 	select HAS_MCUX_CACHE
+	select SOC_PREP_HOOK
 
 config SOC_MIMX8ML8_ADSP
 	select XTENSA
@@ -71,6 +75,7 @@ config SOC_MIMX8ML8_M7
 	select ARM_MPU
 	select HAS_MCUX_IGPIO
 	select HAS_MCUX_IOMUXC
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMX8MQ6_M4
 	select ARM

soc/nxp/imx/imx8m/a53/soc.c

@@ -52,11 +52,7 @@ static void soc_rdc_init(void)
 
 #endif
 
-static int soc_init(void)
+void soc_prep_hook(void)
 {
 	soc_rdc_init();
-
-	return 0;
 }
-
-SYS_INIT(soc_init, EARLY, 1);

soc/nxp/imx/imx8m/m4_mini/soc.c

@@ -148,16 +148,12 @@ static void SOC_ClockInit(void)
 	CLOCK_EnableClock(kCLOCK_Sec_Debug);
 }
 
-static int nxp_mimx8mm6_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
 	SOC_RdcInit();
 
 	/* SoC specific Clock settings */
 	SOC_ClockInit();
-
-	return 0;
 }
-
-SYS_INIT(nxp_mimx8mm6_init, PRE_KERNEL_1, 0);

soc/nxp/imx/imx8m/m4_quad/soc.c

@@ -111,16 +111,12 @@ static void SOC_ClockInit(void)
 	CLOCK_EnableClock(kCLOCK_Sec_Debug);
 }
 
-static int nxp_mimx8mq6_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
 	SOC_RdcInit();
 
 	/* SoC specific Clock settings */
 	SOC_ClockInit();
-
-	return 0;
 }
-
-SYS_INIT(nxp_mimx8mq6_init, PRE_KERNEL_1, 0);

soc/nxp/imx/imx8m/m7/soc.c

@@ -203,7 +203,7 @@ static void gpio_init(void)
 #endif
 }
 
-static int nxp_mimx8ml8_init(void)
+void soc_early_init_hook(void)
 {
 
 	/* SoC specific RDC settings */
@@ -213,8 +213,4 @@ static int nxp_mimx8ml8_init(void)
 	SOC_ClockInit();
 
 	gpio_init();
-
-	return 0;
 }
-
-SYS_INIT(nxp_mimx8ml8_init, PRE_KERNEL_1, 0);

soc/nxp/imxrt/imxrt10xx/Kconfig

@@ -6,7 +6,6 @@ config SOC_SERIES_IMXRT10XX
 	select CPU_CORTEX_M_HAS_DWT
 	select CPU_HAS_ICACHE
 	select CPU_HAS_DCACHE
-	select SOC_RESET_HOOK
 	select CPU_HAS_CUSTOM_FIXED_SOC_MPU_REGIONS
 	select ARM
 	select CLOCK_CONTROL
@@ -29,6 +28,8 @@ config SOC_SERIES_IMXRT10XX
 	select HAS_MCUX_USB_EHCI
 	select HAS_SWO
 	select HAS_PM
+	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 
 config SOC_MIMXRT1011
 	select CPU_HAS_FPU