Skip to content

Commit 86f65f2

Browse files
decsnyfabiobaltieri
authored andcommitted
dts: nxp: Rename nxp,iap-msf1 to nxp,msf1
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 <[email protected]>
1 parent 247037b commit 86f65f2

File tree

7 files changed

+10
-11
lines changed

7 files changed

+10
-11
lines changed

drivers/flash/Kconfig.mcux

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ config SOC_FLASH_MCUX
88
DT_HAS_NXP_KINETIS_FTFL_ENABLED || \
99
DT_HAS_NXP_IAP_FMC55_ENABLED || \
1010
DT_HAS_NXP_IAP_FMC553_ENABLED || \
11-
DT_HAS_NXP_IAP_MSF1_ENABLED
11+
DT_HAS_NXP_MSF1_ENABLED
1212
select FLASH_HAS_PAGE_LAYOUT
1313
select FLASH_HAS_DRIVER_ENABLED
1414
select FLASH_HAS_EXPLICIT_ERASE

drivers/flash/soc_flash_mcux.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ LOG_MODULE_REGISTER(flash_mcux);
3434
#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc553))
3535
#define DT_DRV_COMPAT nxp_iap_fmc553
3636
#define SOC_HAS_IAP 1
37-
#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_msf1))
38-
#define DT_DRV_COMPAT nxp_iap_msf1
39-
#define SOC_HAS_IAP_MSF1 1
37+
#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_msf1))
38+
#define DT_DRV_COMPAT nxp_msf1
39+
#define SOC_HAS_MSF1 1
4040
#else
4141
#error No matching compatible for soc_flash_mcux.c
4242
#endif
@@ -300,7 +300,7 @@ static const struct flash_driver_api flash_mcux_api = {
300300
#endif
301301
};
302302

303-
#if (defined(SOC_HAS_IAP) || defined(SOC_HAS_IAP_MSF1)) && !defined(CONFIG_MCUX_FLASH_K4_API)
303+
#if (defined(SOC_HAS_IAP) || defined(SOC_HAS_MSF1)) && !defined(CONFIG_MCUX_FLASH_K4_API)
304304
#define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflashBlockBaseAddr
305305
#else
306306
#define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflash0BlockBaseAddr

dts/arm/nxp/nxp_mcxa156.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
};
137137

138138
fmu: flash-controller@40095000 {
139-
compatible = "nxp,iap-msf1";
139+
compatible = "nxp,msf1";
140140
reg = <0x40095000 0x1000>;
141141
interrupts = <12 0>;
142142

dts/arm/nxp/nxp_mcxn23x_common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@
485485
};
486486

487487
fmu: flash-controller@43000 {
488-
compatible = "nxp,iap-msf1";
488+
compatible = "nxp,msf1";
489489
reg = <0x43000 0x1000>;
490490
interrupts = <138 0>;
491491
status = "disabled";

dts/arm/nxp/nxp_mcxn94x_common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@
560560
};
561561

562562
fmu: flash-controller@43000 {
563-
compatible = "nxp,iap-msf1";
563+
compatible = "nxp,msf1";
564564
reg = <0x43000 0x1000>;
565565
interrupts = <138 0>;
566566
status = "disabled";

dts/arm/nxp/nxp_mcxw71.dtsi

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,7 @@
8383
ranges = <0x0 0x10000000 DT_SIZE_M(1)>;
8484
#address-cells = <1>;
8585
#size-cells = <1>;
86-
87-
compatible = "nxp,iap-msf1";
86+
compatible = "nxp,msf1";
8887
reg = <0x20000 0x1000>;
8988
interrupts = <27 0>;
9089
status = "disabled";

dts/bindings/flash_controller/nxp,iap-msf1.yaml renamed to dts/bindings/flash_controller/nxp,msf1.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33

44
description: NXP MSF1 Flash Memory Module (FMU)
55

6-
compatible: "nxp,iap-msf1"
6+
compatible: "nxp,msf1"
77

88
include: flash-controller.yaml

0 commit comments

Comments
 (0)