soc: nxp: mcxw: Switch to soc_reset_hook

Base enablement of MCXW merged while z_arm_platform_init was being
deprecated, resulting situation is now that no platform init is
happening, fix by converting to use soc_reset_hook.

Also fix a comment that said the core was being set to 40 MHz, when it
is actually being set up to 96 MHz.

Signed-off-by: Declan Snyder <[email protected]>

Author: decsny

soc/nxp/mcx/mcxw/Kconfig

@@ -12,5 +12,6 @@ config SOC_SERIES_MCXW
 	select CPU_HAS_ARM_MPU
 	select ARMV8_M_DSP
 	select HAS_MCUX
-	select PLATFORM_SPECIFIC_INIT
+	select SOC_RESET_HOOK
+	select SOC_EARLY_INIT_HOOK
 	select CLOCK_CONTROL

soc/nxp/mcx/mcxw/mcxw71_platform_init.S

@@ -16,13 +16,11 @@
 #include <zephyr/linker/sections.h>
 
 _ASM_FILE_PROLOGUE
-#ifdef CONFIG_PLATFORM_SPECIFIC_INIT
 
+GTEXT(soc_reset_hook)
+SECTION_SUBSEC_FUNC(TEXT,_reset_section,soc_reset_hook)
 
-GTEXT(z_arm_platform_init)
-SECTION_SUBSEC_FUNC(TEXT,_reset_section,z_arm_platform_init)
-
-.z_arm_platform_init:
+.soc_reset_hook:
     ldr r0, =0x14000000
     ldr r1, =.ram_init_ctcm01
     bics r1, #0x10000000
@@ -55,5 +53,3 @@ SECTION_SUBSEC_FUNC(TEXT,_reset_section,z_arm_platform_init)
     bcc .loop5
 .ram_init_done:
     b SystemInit
-
-#endif /* CONFIG_PLATFORM_SPECIFIC_INIT */

soc/nxp/mcx/mcxw/soc.c

@@ -144,23 +144,19 @@ static void vbat_init(void)
 	base->STATUSA |= VBAT_STATUSA_POR_DET_MASK;
 };
 
-static int nxp_mcxw71_init(void)
+void soc_early_init_hook(void)
 {
 	unsigned int oldLevel; /* old interrupt lock level */
 
 	/* disable interrupts */
 	oldLevel = irq_lock();
 
-	/* Initialize system clock to 40 MHz */
+	/* Initialize system clock to 96 MHz */
 	clock_init();
 
 	/* Smart power switch initialization */
 	vbat_init();
 
 	/* restore interrupt state */
 	irq_unlock(oldLevel);
-
-	return 0;
 }
-
-SYS_INIT(nxp_mcxw71_init, PRE_KERNEL_1, 0);