Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Oct 9, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion drivers/flash/Kconfig.mcux
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions drivers/flash/soc_flash_mcux.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@
#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

Check notice on line 40 in drivers/flash/soc_flash_mcux.c

View workflow job for this annotation

GitHub Actions / Run compliance checks on patch series (PR)

You may want to run clang-format on this change 

drivers/flash/soc_flash_mcux.c:40 
-#define SOC_HAS_MSF1 1
+#define SOC_HAS_MSF1  1
#error No matching compatible for soc_flash_mcux.c
#endif

Expand Down Expand Up @@ -300,7 +300,7 @@
#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
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/nxp/nxp_mcxa156.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
};

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

Expand Down
2 changes: 1 addition & 1 deletion dts/arm/nxp/nxp_mcxn23x_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,7 +485,7 @@
};

fmu: flash-controller@43000 {
compatible = "nxp,iap-msf1";
compatible = "nxp,msf1";
reg = <0x43000 0x1000>;
interrupts = <138 0>;
status = "disabled";
Expand Down
2 changes: 1 addition & 1 deletion dts/arm/nxp/nxp_mcxn94x_common.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,7 +560,7 @@
};

fmu: flash-controller@43000 {
compatible = "nxp,iap-msf1";
compatible = "nxp,msf1";
reg = <0x43000 0x1000>;
interrupts = <138 0>;
status = "disabled";
Expand Down
3 changes: 1 addition & 2 deletions dts/arm/nxp/nxp_mcxw71.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
2 changes: 1 addition & 1 deletion ...ndings/flash_controller/nxp,iap-msf1.yaml → dts/bindings/flash_controller/nxp,msf1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@

description: NXP MSF1 Flash Memory Module (FMU)

compatible: "nxp,iap-msf1"
compatible: "nxp,msf1"

include: flash-controller.yaml
Loading