Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions boards/nxp/frdm_mcxa153/frdm_mcxa153.dts
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
zephyr,code-partition = &slot0_partition;
zephyr,console = &lpuart0;
zephyr,shell-uart = &lpuart0;
zephyr,edac = &erm0;
};

leds {
Expand Down Expand Up @@ -80,6 +81,18 @@
status = "okay";
};

&eim0 {
status = "okay";
};

&eim0_channel0 {
status = "okay";
};

&erm0 {
status = "okay";
};

&edma0 {
status = "okay";
};
Expand Down
25 changes: 25 additions & 0 deletions boards/nxp/frdm_mcxn236/frdm_mcxn236.dts
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
zephyr,console = &flexcomm4_lpuart4;
zephyr,shell-uart = &flexcomm4_lpuart4;
zephyr,canbus = &flexcan1;
zephyr,edac = &erm0;
};

aliases {
Expand Down Expand Up @@ -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";
};
Expand Down
36 changes: 36 additions & 0 deletions boards/nxp/frdm_mcxn947/frdm_mcxn947.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,10 @@
mcuboot-button0 = &user_button_2;
};

chosen {
zephyr,edac = &erm0;
};

leds {
compatible = "gpio-leds";

Expand Down Expand Up @@ -111,6 +115,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";
Expand Down
2 changes: 2 additions & 0 deletions drivers/edac/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)
2 changes: 2 additions & 0 deletions drivers/edac/Kconfig
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
# Copyright (c) 2020 Intel Corp.
# Copyright 2025 NXP
# SPDX-License-Identifier: Apache-2.0
#
# EDAC configuration options
Expand Down Expand Up @@ -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"
Expand Down
27 changes: 27 additions & 0 deletions drivers/edac/Kconfig.mcux_erm
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
# 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
Loading
Loading