michaelh/zephyr
1
0
Fork 0
Code Releases Activity

flash: nxp: updating drivers, Kconfig and device trees with new bindings

Browse source 
The lpc and mcux drivers' DRV_COMPAT is updated for the new bindings
introduced in the previous commit. The drivers' Kconfig files also
reflect this change (DT_HAS_ENABLED_NXP_...).
The SoC device trees are updated with the new bindings

Signed-off-by: Yves Vandervennet <yves.vandervennet@nxp.com>
This commit is contained in:
Yves Vandervennet 2022-08-12 09:05:25 -05:00 • committed by Mahesh Mahadevan
commit da3d0b3492
10 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
drivers/flash/Kconfig.lpc
View file

@ -4,7 +4,7 @@
config SOC_FLASH_LPC config SOC_FLASH_LPC
bool "LPC flash shim driver" bool "LPC flash shim driver"
default y default y
depends on DT_HAS_NXP_LPC_IAP_ENABLED depends on DT_HAS_NXP_IAP_FMC11_ENABLED
select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED select FLASH_HAS_DRIVER_ENABLED
help help

4
drivers/flash/Kconfig.mcux
View file

@ -6,7 +6,9 @@ config SOC_FLASH_MCUX
depends on DT_HAS_NXP_LPC_IAP_ENABLED || \ depends on DT_HAS_NXP_LPC_IAP_ENABLED || \
DT_HAS_NXP_KINETIS_FTFA_ENABLED || \ DT_HAS_NXP_KINETIS_FTFA_ENABLED || \
DT_HAS_NXP_KINETIS_FTFE_ENABLED || \ DT_HAS_NXP_KINETIS_FTFE_ENABLED || \
DT_HAS_NXP_KINETIS_FTFL_ENABLED DT_HAS_NXP_KINETIS_FTFL_ENABLED || \
DT_HAS_NXP_IAP_FMC55_ENABLED || \
DT_HAS_NXP_IAP_FMC553_ENABLED
select FLASH_HAS_PAGE_LAYOUT select FLASH_HAS_PAGE_LAYOUT
select FLASH_HAS_DRIVER_ENABLED select FLASH_HAS_DRIVER_ENABLED
select MPU_ALLOW_FLASH_WRITE if ARM_MPU select MPU_ALLOW_FLASH_WRITE if ARM_MPU

4
drivers/flash/soc_flash_lpc.c
View file

@ -17,8 +17,8 @@
#include "fsl_flashiap.h" #include "fsl_flashiap.h"
#if DT_NODE_HAS_STATUS(DT_INST(0, nxp_lpc_iap), okay) #if DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc11), okay)
#define DT_DRV_COMPAT nxp_lpc_iap #define DT_DRV_COMPAT nxp_iap_fmc11
#else #else
#error No matching compatible for soc_flash_lpc.c #error No matching compatible for soc_flash_lpc.c
#endif #endif

6
drivers/flash/soc_flash_mcux.c
View file

@ -31,8 +31,10 @@ LOG_MODULE_REGISTER(flash_mcux);
#define DT_DRV_COMPAT nxp_kinetis_ftfe #define DT_DRV_COMPAT nxp_kinetis_ftfe
#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfl), okay) #elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_kinetis_ftfl), okay)
#define DT_DRV_COMPAT nxp_kinetis_ftfl #define DT_DRV_COMPAT nxp_kinetis_ftfl
#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_lpc_iap), okay) #elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc55), okay)
#define DT_DRV_COMPAT nxp_lpc_iap #define DT_DRV_COMPAT nxp_iap_fmc55
#elif DT_NODE_HAS_STATUS(DT_INST(0, nxp_iap_fmc553), okay)
#define DT_DRV_COMPAT nxp_iap_fmc553
#else #else
#error No matching compatible for soc_flash_mcux.c #error No matching compatible for soc_flash_mcux.c
#endif #endif

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

@ -85,7 +85,7 @@
}; };
iap: flash-controller@4009c000 { iap: flash-controller@4009c000 {
compatible = "nxp,lpc-iap"; compatible = "nxp,iap-fmc54";
reg = <0x4009c000 0x18>; reg = <0x4009c000 0x18>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

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

@ -72,7 +72,7 @@
}; };
iap: flash-controller@34000 { iap: flash-controller@34000 {
compatible = "nxp,lpc-iap"; compatible = "nxp,iap-fmc55";
reg = <0x34000 0x18>; reg = <0x34000 0x18>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

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

@ -75,7 +75,7 @@
}; };
iap: flash-controller@34000 { iap: flash-controller@34000 {
compatible = "nxp,lpc-iap"; compatible = "nxp,iap-fmc55";
reg = <0x34000 0x18>; reg = <0x34000 0x18>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

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

@ -82,7 +82,7 @@
}; };
iap: flash-controller@34000 { iap: flash-controller@34000 {
compatible = "nxp,lpc-iap"; compatible = "nxp,iap-fmc55";
reg = <0x34000 0x1000>; reg = <0x34000 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

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

@ -75,7 +75,7 @@
}; };
iap: flash-controller@34000 { iap: flash-controller@34000 {
compatible = "nxp,lpc-iap"; compatible = "nxp,iap-fmc553";
reg = <0x34000 0x1000>; reg = <0x34000 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;

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

@ -96,7 +96,7 @@
}; };
iap: flash-controller@34000 { iap: flash-controller@34000 {
compatible = "nxp,lpc-iap"; compatible = "nxp,iap-fmc55";
reg = <0x34000 0x1000>; reg = <0x34000 0x1000>;
#address-cells = <1>; #address-cells = <1>;
#size-cells = <1>; #size-cells = <1>;