Skip to content

[nrf fromtree] Wzn 5584 nrf mramc update #3137

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

Merged
merged 2 commits into from
Aug 7, 2025
Merged

[nrf fromtree] Wzn 5584 nrf mramc update #3137

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba94de6
[nrf fromtree] drivers: flash: nordic: fix nrf-mramc indentation
travis3630 Jul 23, 2025
fbcce42
[nrf fromtree] drivers: flash: nordic: nrf_mramc update
travis3630 Jul 29, 2025
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
28 changes: 9 additions & 19 deletions drivers/flash/soc_flash_nrf_mramc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
* SPDX-License-Identifier: Apache-2.0
*/

#include <string.h>
#include <string.h>

#include <zephyr/drivers/flash.h>
#include <zephyr/logging/log.h>
#include <nrfx_mramc.h>
#if defined(CONFIG_SOC_FLASH_NRF_MRAMC_FLUSH_CACHE)
#include <hal/nrf_cache.h>
#endif
#include <zephyr/drivers/flash.h>
#include <zephyr/logging/log.h>
#include <nrfx_mramc.h>
#if defined(CONFIG_SOC_FLASH_NRF_MRAMC_FLUSH_CACHE)
#include <zephyr/cache.h>
#endif

LOG_MODULE_REGISTER(flash_nrf_mramc, CONFIG_FLASH_LOG_LEVEL);

Expand Down Expand Up @@ -112,13 +112,7 @@ static int nrf_mramc_write(const struct device *dev, off_t offset,
* and not number of bytes
*/
nrfx_mramc_words_write(addr, data, len / WRITE_BLOCK_SIZE);
#if defined(CONFIG_SOC_FLASH_NRF_MRAMC_FLUSH_CACHE)
if (nrf_cache_enable_check(NRF_ICACHE)) {
while (nrf_cache_busy_check(NRF_ICACHE)) {
}
nrf_cache_invalidate(NRF_ICACHE);
}
#endif

return 0;
}

Expand All @@ -144,11 +138,7 @@ static int nrf_mramc_erase(const struct device *dev, off_t offset, size_t size)
*/
nrfx_mramc_area_erase(addr, size / WRITE_BLOCK_SIZE);
#if defined(CONFIG_SOC_FLASH_NRF_MRAMC_FLUSH_CACHE)
if (nrf_cache_enable_check(NRF_ICACHE)) {
while (nrf_cache_busy_check(NRF_ICACHE)) {
}
nrf_cache_invalidate(NRF_ICACHE);
}
sys_cache_instr_invd_all();
#endif
return 0;
}
Expand Down