OrgZephyr/zephyr
OrgZephyr
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

drivers: soc_mcux_flash: Add flash_k4 support 

Add support for flash_k4 api from the mcux SDK.

Signed-off-by: Declan Snyder <declan.snyder@nxp.com>
This commit is contained in:
Declan Snyder 2024-09-06 08:27:06 -05:00 committed by Maureen Helm
parent 846601f260
commit 448485a967
2 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/flash/Kconfig.mcux
View File

@ -30,6 +30,12 @@ config CHECK_BEFORE_READING
This feature prevents erroneous/forbidden reading. Some ECC enabled
devices will crash when reading an erased or wrongly programmed area.
config MCUX_FLASH_K4_API
bool
help
Set from SOC level configuration if the platform is meant to use the
flash_k4 SDK IAP API.
endif # SOC_FLASH_MCUX
if DT_HAS_NXP_IMX_FLEXSPI_ENABLED

30
drivers/flash/soc_flash_mcux.c
View File

@ -47,11 +47,12 @@ LOG_MODULE_REGISTER(flash_mcux);
#include "fsl_romapi.h"
#define FLASH_Erase FLASH_EraseSector
#define FLASH_Program FLASH_ProgramPhrase
#elif defined(CONFIG_MCUX_FLASH_K4_API)
#include "fsl_k4_flash.h"
#else
#include "fsl_flash.h"
#endif /* SOC_HAS_IAP && !CONFIG_SOC_LPC55S36*/
#define SOC_NV_FLASH_NODE DT_INST(0, soc_nv_flash)
#if defined(CONFIG_CHECK_BEFORE_READING) && !defined(CONFIG_SOC_LPC55S36)
@ -166,7 +167,11 @@ static int flash_mcux_erase(const struct device *dev, off_t offset,
addr = offset + priv->pflash_block_base;
key = irq_lock();
rc = FLASH_Erase(&priv->config, addr, len, kFLASH_ApiEraseKey);
rc = FLASH_Erase(&priv->config,
#if CONFIG_MCUX_FLASH_K4_API
(FMU_Type *) DT_INST_REG_ADDR(0),
#endif
addr, len, kFLASH_ApiEraseKey);
irq_unlock(key);
k_sem_give(&priv->write_lock);
@ -247,7 +252,11 @@ static int flash_mcux_write(const struct device *dev, off_t offset,
addr = offset + priv->pflash_block_base;
key = irq_lock();
rc = FLASH_Program(&priv->config, addr, (uint8_t *) data, len);
rc = FLASH_Program(&priv->config,
#if CONFIG_MCUX_FLASH_K4_API
(FMU_Type *) DT_INST_REG_ADDR(0),
#endif
addr, (uint8_t *) data, len);
irq_unlock(key);
k_sem_give(&priv->write_lock);
@ -291,6 +300,12 @@ 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)
#define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflashBlockBaseAddr
#else
#define FLASH_PROP_BLOCK_BASE kFLASH_PropertyPflash0BlockBaseAddr
#endif
static int flash_mcux_init(const struct device *dev)
{
struct flash_priv *priv = dev->data;
@ -301,13 +316,8 @@ static int flash_mcux_init(const struct device *dev)
rc = FLASH_Init(&priv->config);
#if defined(SOC_HAS_IAP) || defined(SOC_HAS_IAP_MSF1)
FLASH_GetProperty(&priv->config, kFLASH_PropertyPflashBlockBaseAddr,
&pflash_block_base);
#else
FLASH_GetProperty(&priv->config, kFLASH_PropertyPflash0BlockBaseAddr,
&pflash_block_base);
#endif
FLASH_GetProperty(&priv->config, FLASH_PROP_BLOCK_BASE, &pflash_block_base);
priv->pflash_block_base = (uint32_t) pflash_block_base;
return (rc == kStatus_Success) ? 0 : -EIO;