Add nxp edac driver

boards/nxp/frdm_mcxa153/frdm_mcxa153.dts

@@ -35,6 +35,7 @@
 		zephyr,code-partition = &slot0_partition;
 		zephyr,console = &lpuart0;
 		zephyr,shell-uart = &lpuart0;
+		zephyr,edac = &erm0;
 	};
 
 	leds {
@@ -129,6 +130,18 @@
 	status = "okay";
 };
 
+&eim0 {
+	status = "okay";
+};
+
+&eim0_channel0 {
+	status = "okay";
+};
+
+&erm0 {
+	status = "okay";
+};
+
 &edma0 {
 	status = "okay";
 };

boards/nxp/frdm_mcxe247/frdm_mcxe247.dts

@@ -1,3 +1,3 @@
 /*
  * Copyright 2025 NXP
  *
@@ -29,18 +29,19 @@
 		zephyr,console = &lpuart2;
 		zephyr,shell-uart = &lpuart2;
 		zephyr,canbus = &flexcan0;
+		zephyr,edac = &erm0;
 	};
 
 	leds {
 		compatible = "gpio-leds";
 		red_led: led_0 {
 			gpios = <&gpioc 13 GPIO_ACTIVE_LOW>;
 			label = "Red LED";
 		};
 		green_led: led_1 {
 			gpios = <&gpiob 11 GPIO_ACTIVE_LOW>;
 			label = "Green LED";
 		};
 		blue_led: led_2 {
 			gpios = <&gpioc 12 GPIO_ACTIVE_LOW>;
 			label = "Blue LED";
@@ -48,12 +49,12 @@
 	};
 
 	gpio_keys {
 		compatible = "gpio-keys";
 		user_button_2: button_2 {
 			label = "User SW2";
 			gpios = <&gpioa 9 GPIO_ACTIVE_LOW>;
 			zephyr,code = <INPUT_KEY_0>;
 		};
 		user_button_3: button_3 {
 			label = "User SW3";
 			gpios = <&gpioc 10 GPIO_ACTIVE_LOW>;
@@ -95,6 +96,18 @@
 	clock-frequency = <80000000>;
 };
 
+&erm0 {
+	status = "okay";
+};
+
+&eim0 {
+	status = "okay";
+};
+
+&eim0_channel1 {
+	status = "okay";
+};
+
 &sosc_clk {
 	clock-frequency = <8000000>;
 	status = "okay";

boards/nxp/frdm_mcxe31b/frdm_mcxe31b.dts

@@ -30,6 +30,8 @@
 		zephyr,flash = &program_flash;
 		zephyr,flash-controller = &flash;
 		zephyr,console = &lpuart_5;
+		zephyr,edac = &erm0;
+		zephyr,shell-uart = &lpuart_5;
 	};
 
 	leds {
@@ -95,6 +97,22 @@
 	clock-frequency = <DT_FREQ_M(160)>;
 };
 
+&erm0 {
+	status = "okay";
+};
+
+&eim0 {
+	status = "okay";
+};
+
+&eim0_channel14 {
+	status = "okay";
+};
+
+&eim0_channel15 {
+	status = "okay";
+};
+
 &gpiob_h {
 	status = "okay";
 };

boards/nxp/frdm_mcxn236/frdm_mcxn236.dts

@@ -26,6 +26,7 @@
 		zephyr,console = &flexcomm4_lpuart4;
 		zephyr,shell-uart = &flexcomm4_lpuart4;
 		zephyr,canbus = &flexcan1;
+		zephyr,edac = &erm0;
 	};
 
 	aliases {
@@ -161,6 +162,30 @@
 	status = "okay";
 };
 
+&eim0 {
+	status = "okay";
+};
+
+&eim0_channel0 {
+	status = "okay";
+};
+
+&eim0_channel2 {
+	status = "okay";
+};
+
+&eim0_channel3 {
+	status = "okay";
+};
+
+&eim0_channel4 {
+	status = "okay";
+};
+
+&erm0 {
+	status = "okay";
+};
+
 &flexcomm2 {
 	status = "okay";
 };

boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi

@@ -21,6 +21,10 @@
 		mcuboot-button0 = &user_button_2;
 	};
 
+	chosen {
+		zephyr,edac = &erm0;
+	};
+
 	leds {
 		compatible = "gpio-leds";
 
@@ -130,6 +134,38 @@
 	};
 };
 
+&eim0 {
+	status = "okay";
+};
+
+&eim0_channel0 {
+	status = "okay";
+};
+
+&eim0_channel2 {
+	status = "okay";
+};
+
+&eim0_channel3 {
+	status = "okay";
+};
+
+&eim0_channel4 {
+	status = "okay";
+};
+
+&eim0_channel5 {
+	status = "okay";
+};
+
+&eim0_channel6 {
+	status = "okay";
+};
+
+&erm0 {
+	status = "okay";
+};
+
 &flexcomm1_lpspi1 {
 	pinctrl-0 = <&pinmux_flexcomm1_lpspi>;
 	pinctrl-names = "default";

drivers/edac/CMakeLists.txt

@@ -1,8 +1,10 @@
 # Copyright (c) 2020 Intel Corporation
+# Copyright 2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 
 zephyr_library()
 
 zephyr_library_sources_ifdef(CONFIG_EDAC_IBECC edac_ibecc.c)
 zephyr_library_sources_ifdef(CONFIG_EDAC_SYNOPSYS edac_synopsys.c)
+zephyr_library_sources_ifdef(CONFIG_EDAC_NXP_ERM edac_mcux_erm.c)
 zephyr_library_sources_ifdef(CONFIG_EDAC_SHELL shell.c)

drivers/edac/Kconfig

@@ -1,4 +1,5 @@
 # Copyright (c) 2020 Intel Corp.
+# Copyright 2025 NXP
 # SPDX-License-Identifier: Apache-2.0
 #
 # EDAC configuration options
@@ -35,6 +36,7 @@ config EDAC_SYNOPSYS
 	help
 	  Enable the Synopsys DDR controller EDAC driver.
 
+source "drivers/edac/Kconfig.mcux_erm"
 module = EDAC
 module-str = edac
 source "subsys/logging/Kconfig.template.log_config"

drivers/edac/Kconfig.mcux_erm

@@ -0,0 +1,34 @@
+# Copyright 2025 NXP
+#
+# SPDX-License-Identifier: Apache-2.0
+
+config EDAC_NXP_ERM
+	bool "NXP ERM driver"
+	default y
+	depends on DT_HAS_NXP_ERM_ENABLED
+	help
+	  Enable the NXP Error Reporting Module driver.
+
+config EDAC_NXP_ERM_DEFAULT_CHANNEL
+	int "NXP ERM default channel"
+	default 0
+	depends on EDAC_NXP_ERM
+	help
+	  Set the NXP Error Reporting Module default channel.
+
+config EDAC_NXP_EIM
+	bool "NXP EIM driver"
+	default y
+	depends on DT_HAS_NXP_EIM_ENABLED
+	help
+	  Enable the NXP Error Injection Module driver.
+
+config EDAC_ERROR_INJECT
+	depends on EDAC_NXP_EIM
+
+config EDAC_NXP_ERM_VARY_WITH_EIM_CHANNEL
+	bool "Update EIM channel based on EIM channel"
+	default y
+	depends on EDAC_NXP_EIM && EDAC_NXP_ERM
+	help
+	  Allow ERM channel to dynamically adapt based on the selected EIM channel.