michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nxp: Rename nxp,iap-msf1 to nxp,msf1

Browse source 
IAP is a reference to the method of software interaction with the flash
used in the current driver implementing support for this flash. The
DT compatible should not be named like this.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-09-25 10:50:43 -05:00 • committed by Fabio Baltieri
commit 86f65f2591
7 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/flash/Kconfig.mcux
View file

@ -8,7 +8,7 @@ config SOC_FLASH_MCUX
DT_HAS_NXP_KINETIS_FTFL_ENABLED || \ DT_HAS_NXP_KINETIS_FTFL_ENABLED || \
DT_HAS_NXP_IAP_FMC55_ENABLED || \ DT_HAS_NXP_IAP_FMC55_ENABLED || \
DT_HAS_NXP_IAP_FMC553_ENABLED || \ DT_HAS_NXP_IAP_FMC553_ENABLED || \
DT_HAS_NXP_IAP_MSF1_ENABLED DT_HAS_NXP_MSF1_ENABLED
select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED select FLASH_HAS_DRIVER_ENABLED
select FLASH_HAS_EXPLICIT_ERASE select FLASH_HAS_EXPLICIT_ERASE

8
drivers/flash/soc_flash_mcux.c
View file

@ -34,9 +34,9 @@ LOG_MODULE_REGISTER(flash_mcux);
#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc553)) #elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc553))
#define DT_DRV_COMPAT nxp_iap_fmc553 #define DT_DRV_COMPAT nxp_iap_fmc553
#define SOC_HAS_IAP 1 #define SOC_HAS_IAP 1
#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_msf1)) #elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_msf1))
#define DT_DRV_COMPAT nxp_iap_msf1 #define DT_DRV_COMPAT nxp_msf1
#define SOC_HAS_IAP_MSF1 1 #define SOC_HAS_MSF1 1
#else #else
#error No matching compatible for soc_flash_mcux.c #error No matching compatible for soc_flash_mcux.c
#endif #endif
@ -300,7 +300,7 @@ static const struct flash_driver_api flash_mcux_api = {
#endif #endif
}; };
#if (defined(SOC_HAS_IAP) || defined(SOC_HAS_IAP_MSF1)) && !defined(CONFIG_MCUX_FLASH_K4_API) #if (defined(SOC_HAS_IAP) || defined(SOC_HAS_MSF1)) && !defined(CONFIG_MCUX_FLASH_K4_API)
#define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflashBlockBaseAddr #define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflashBlockBaseAddr
#else #else
#define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflash0BlockBaseAddr #define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflash0BlockBaseAddr

2
dts/arm/nxp/nxp_mcxa156.dtsi
View file

@ -136,7 +136,7 @@
}; };
fmu: flash-controller@40095000 { fmu: flash-controller@40095000 {
compatible = "nxp,iap-msf1"; compatible = "nxp,msf1";
reg = <0x40095000 0x1000>; reg = <0x40095000 0x1000>;
interrupts = <12 0>; interrupts = <12 0>;

2
dts/arm/nxp/nxp_mcxn23x_common.dtsi
View file

@ -485,7 +485,7 @@
}; };
fmu: flash-controller@43000 { fmu: flash-controller@43000 {
compatible = "nxp,iap-msf1"; compatible = "nxp,msf1";
reg = <0x43000 0x1000>; reg = <0x43000 0x1000>;
interrupts = <138 0>; interrupts = <138 0>;
status = "disabled"; status = "disabled";

2
dts/arm/nxp/nxp_mcxn94x_common.dtsi
View file

@ -560,7 +560,7 @@
}; };
fmu: flash-controller@43000 { fmu: flash-controller@43000 {
compatible = "nxp,iap-msf1"; compatible = "nxp,msf1";
reg = <0x43000 0x1000>; reg = <0x43000 0x1000>;
interrupts = <138 0>; interrupts = <138 0>;
status = "disabled"; status = "disabled";

3
dts/arm/nxp/nxp_mcxw71.dtsi
View file

@ -83,8 +83,7 @@
ranges = <0x0 0x10000000 DT_SIZE_M(1)>; ranges = <0x0 0x10000000 DT_SIZE_M(1)>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;
compatible = "nxp,msf1";
compatible = "nxp,iap-msf1";
reg = <0x20000 0x1000>; reg = <0x20000 0x1000>;
interrupts = <27 0>; interrupts = <27 0>;
status = "disabled"; status = "disabled";

2
dts/bindings/flash_controller/nxp,iap-msf1.yaml → dts/bindings/flash_controller/nxp,msf1.yaml
View file

@ -3,6 +3,6 @@
description: NXP MSF1 Flash Memory Module (FMU) description: NXP MSF1 Flash Memory Module (FMU)
compatible: "nxp,iap-msf1" compatible: "nxp,msf1"
include: flash-controller.yaml include: flash-controller.yaml