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]>
zephyrproject-rtos · Oct 8, 2024 · 911a878 · 911a878
1 parent 2a67664
commit 911a878
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 11 deletions.
diff --git a/drivers/flash/Kconfig.mcux b/drivers/flash/Kconfig.mcux
@@ -8,7 +8,7 @@ config SOC_FLASH_MCUX
 		   DT_HAS_NXP_KINETIS_FTFL_ENABLED || \
 		   DT_HAS_NXP_IAP_FMC55_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_DRIVER_ENABLED
 	select FLASH_HAS_EXPLICIT_ERASE

diff --git a/drivers/flash/soc_flash_mcux.c b/drivers/flash/soc_flash_mcux.c
@@ -34,9 +34,9 @@ LOG_MODULE_REGISTER(flash_mcux);
 #elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_fmc553))
 #define DT_DRV_COMPAT nxp_iap_fmc553
 #define SOC_HAS_IAP 1
-#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_iap_msf1))
-#define DT_DRV_COMPAT nxp_iap_msf1
-#define SOC_HAS_IAP_MSF1 1
+#elif DT_NODE_HAS_STATUS_OKAY(DT_INST(0, nxp_msf1))
+#define DT_DRV_COMPAT nxp_msf1
+#define SOC_HAS_MSF1 1
 #else
 #error No matching compatible for soc_flash_mcux.c
 #endif
@@ -300,7 +300,7 @@ static const struct flash_driver_api flash_mcux_api = {
 #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
 #else
 #define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflash0BlockBaseAddr

diff --git a/dts/arm/nxp/nxp_mcxa156.dtsi b/dts/arm/nxp/nxp_mcxa156.dtsi
@@ -136,7 +136,7 @@
 		};
 
 		fmu: flash-controller@40095000 {
-			compatible = "nxp,iap-msf1";
+			compatible = "nxp,msf1";
 			reg = <0x40095000 0x1000>;
 			interrupts = <12 0>;
 

diff --git a/dts/arm/nxp/nxp_mcxn23x_common.dtsi b/dts/arm/nxp/nxp_mcxn23x_common.dtsi
@@ -485,7 +485,7 @@
 	};
 
 	fmu: flash-controller@43000 {
-		compatible = "nxp,iap-msf1";
+		compatible = "nxp,msf1";
 		reg = <0x43000 0x1000>;
 		interrupts = <138 0>;
 		status = "disabled";

diff --git a/dts/arm/nxp/nxp_mcxn94x_common.dtsi b/dts/arm/nxp/nxp_mcxn94x_common.dtsi
@@ -560,7 +560,7 @@
 	};
 
 	fmu: flash-controller@43000 {
-		compatible = "nxp,iap-msf1";
+		compatible = "nxp,msf1";
 		reg = <0x43000 0x1000>;
 		interrupts = <138 0>;
 		status = "disabled";

diff --git a/dts/arm/nxp/nxp_mcxw71.dtsi b/dts/arm/nxp/nxp_mcxw71.dtsi
@@ -83,8 +83,7 @@
 					ranges = <0x0 0x10000000 DT_SIZE_M(1)>;
 					#address-cells = <1>;
 					#size-cells = <1>;
-
-					compatible = "nxp,iap-msf1";
+					compatible = "nxp,msf1";
 					reg = <0x20000 0x1000>;
 					interrupts = <27 0>;
 					status = "disabled";

diff --git a/...ndings/flash_controller/nxp,iap-msf1.yaml → dts/bindings/flash_controller/nxp,msf1.yaml b/...ndings/flash_controller/nxp,iap-msf1.yaml → dts/bindings/flash_controller/nxp,msf1.yaml
@@ -3,6 +3,6 @@
 
 description: NXP MSF1 Flash Memory Module (FMU)
 
-compatible: "nxp,iap-msf1"
+compatible: "nxp,msf1"
 
 include: flash-controller.yaml