From 3386bf7b5933a9d2bfeb4f423fc19f5acaaeb6d0 Mon Sep 17 00:00:00 2001 From: Dominik Ermel Date: Mon, 11 Mar 2024 16:19:47 +0000 Subject: [PATCH] [nrf fromtree] drivers/flash/nrf_mram: Set no explicit erase capability to true NRF MRAM does not require erase prior to re-programming already written area. Signed-off-by: Dominik Ermel (cherry picked from commit 0e970c83627015090fb4c2eafb1cf99b1ec85aa2) --- drivers/flash/Kconfig.nrf_mram | 1 + drivers/flash/soc_flash_nrf_mram.c | 3 +++ 2 files changed, 4 insertions(+) diff --git a/drivers/flash/Kconfig.nrf_mram b/drivers/flash/Kconfig.nrf_mram index 0ef65864a62..be41cead07f 100644 --- a/drivers/flash/Kconfig.nrf_mram +++ b/drivers/flash/Kconfig.nrf_mram @@ -10,6 +10,7 @@ config SOC_FLASH_NRF_MRAM depends on DT_HAS_NORDIC_MRAM_ENABLED select FLASH_HAS_DRIVER_ENABLED select FLASH_HAS_PAGE_LAYOUT + select FLASH_HAS_NO_EXPLICIT_ERASE imply MPU_ALLOW_FLASH_WRITE if ARM_MPU help Enables Nordic Semiconductor flash driver for MRAM in direct write mode. diff --git a/drivers/flash/soc_flash_nrf_mram.c b/drivers/flash/soc_flash_nrf_mram.c index 9b33ee05d6f..5d8215f7af3 100644 --- a/drivers/flash/soc_flash_nrf_mram.c +++ b/drivers/flash/soc_flash_nrf_mram.c @@ -142,6 +142,9 @@ static const struct flash_parameters *nrf_mram_get_parameters(const struct devic static const struct flash_parameters parameters = { .write_block_size = WRITE_BLOCK_SIZE, .erase_value = ERASE_VALUE, + .caps = { + .no_explicit_erase = true, + }, }; return ¶meters;