From 90412971405f675164b2031b8f6b03acdbc2a8cb Mon Sep 17 00:00:00 2001 From: Declan Snyder Date: Wed, 25 Sep 2024 10:50:43 -0500 Subject: [PATCH] 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 --- drivers/flash/Kconfig.mcux | 2 +- drivers/flash/soc_flash_mcux.c | 8 ++++---- dts/arm/nxp/nxp_mcxa156.dtsi | 2 +- dts/arm/nxp/nxp_mcxn23x_common.dtsi | 2 +- dts/arm/nxp/nxp_mcxn94x_common.dtsi | 2 +- dts/arm/nxp/nxp_mcxw71.dtsi | 2 +- dts/bindings/flash_controller/nxp,iap-msf1.yaml | 2 +- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/flash/Kconfig.mcux b/drivers/flash/Kconfig.mcux index 2ec37bc5f62c702..df2ba1ecc699243 100644 --- 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 index e4a9e8ff7de941d..e6db3da9365e8bb 100644 --- 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(DT_INST(0, nxp_iap_fmc553), okay) #define DT_DRV_COMPAT nxp_iap_fmc553 #define SOC_HAS_IAP 1 -#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_msf1), okay) -#define DT_DRV_COMPAT nxp_iap_msf1 -#define SOC_HAS_IAP_MSF1 1 +#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_msf1), okay) +#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 index a7d4eddc90e79b4..3397861dc63925b 100644 --- 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 index 18495b1069c8d8f..4d8c1992081e720 100644 --- 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 index e521ba97532b1c3..bb33a8f6081b3a9 100644 --- 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 index ca40080e2f48133..cfb4588b4e3e849 100644 --- a/dts/arm/nxp/nxp_mcxw71.dtsi +++ b/dts/arm/nxp/nxp_mcxw71.dtsi @@ -72,7 +72,7 @@ #address-cells = <1>; #size-cells = <1>; - compatible = "nxp,iap-msf1"; + compatible = "nxp,msf1"; reg = <0x20000 0x1000>; interrupts = <27 0>; status = "disabled"; diff --git a/dts/bindings/flash_controller/nxp,iap-msf1.yaml b/dts/bindings/flash_controller/nxp,iap-msf1.yaml index 63eef10a7d73897..c9012ab582e9db4 100644 --- a/dts/bindings/flash_controller/nxp,iap-msf1.yaml +++ b/dts/bindings/flash_controller/nxp,iap-msf1.yaml @@ -3,6 +3,6 @@ description: NXP MSF1 Flash Memory Module (FMU) -compatible: "nxp,iap-msf1" +compatible: "nxp,msf1" include: flash-controller.yaml