michaelh/zephyr
1
0
Fork 0
Code Releases Activity

dts: nrf_qspi_nor: add option for specifying size in bytes

Browse source 
If a user has a 1GB external flash it is currently not possible
to configure this through DTS. To allow for such a configuration
we add an option which specifies the size in bytes not bits.

Signed-off-by: Håkon Øye Amundsen <haakon.amundsen@nordicsemi.no>
This commit is contained in:
Håkon Øye Amundsen 2022-01-07 13:09:18 +01:00 • committed by Carles Cufí
commit 7aeef175e8
5 changed files with 47 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
drivers/flash/nrf_qspi_nor.c
View file

@ -64,7 +64,18 @@ struct qspi_nor_config {
#define QSPI_BLOCK_SIZE SPI_NOR_BLOCK_SIZE
/* instance 0 flash size in bytes */
#if DT_INST_NODE_HAS_PROP(0, size_in_bytes)
#define INST_0_BYTES (DT_INST_PROP(0, size_in_bytes))
#elif DT_INST_NODE_HAS_PROP(0, size)
#define INST_0_BYTES (DT_INST_PROP(0, size) / 8)
#else
#error "No size specified. 'size' or 'size-in-bytes' must be set"
#endif
BUILD_ASSERT(!(DT_INST_NODE_HAS_PROP(0, size_in_bytes) && DT_INST_NODE_HAS_PROP(0, size)),
"Node " DT_NODE_PATH(DT_DRV_INST(0)) " has both size and size-in-bytes "
"properties; use exactly one");
/*
* Determine a configuration value (INST_0_SCK_CFG) to be used to achieve the

11
dts/bindings/mtd/nordic,qspi-nor.yaml
View file

@ -21,7 +21,16 @@ properties:
required: true
size:
required: true
type: int
required: false
description: |
The size in bits. Set this or size-in-bytes, but not both.
size-in-bytes:
type: int
required: false
description: |
The size in bytes. Set this or size, but not both.
# Match original driver NORDIC_QSPI_NOR_QE_BIT Kconfig default.
quad-enable-requirements:

10
tests/drivers/flash/boards/nrf52840_size_in_bytes.overlay Normal file
View file

@ -0,0 +1,10 @@
/*
* Copyright (c) 2022, Nordic Semiconductor ASA
*
* SPDX-License-Identifier: Apache-2.0
*/
&mx25r64 {
/delete-property/ size;
size-in-bytes = <8388608>;
};

10
tests/drivers/flash/src/main.c
View file

@ -11,9 +11,15 @@
#include <storage/flash_map.h>
#if (CONFIG_NORDIC_QSPI_NOR - 0)
#define FLASH_DEVICE DT_LABEL(DT_INST(0, nordic_qspi_nor))
#define NORDIC_QSPI_NOR_NODE DT_INST(0, nordic_qspi_nor)
#define FLASH_DEVICE DT_LABEL(NORDIC_QSPI_NOR_NODE)
#define FLASH_TEST_REGION_OFFSET 0xff000
#define TEST_AREA_MAX DT_PROP(DT_INST(0, nordic_qspi_nor), size)
#if DT_NODE_HAS_PROP(NORDIC_QSPI_NOR_NODE, size_in_bytes)
#define TEST_AREA_MAX (DT_PROP(DT_INST(0, nordic_qspi_nor), size_in_bytes))
#else
#define TEST_AREA_MAX DT_PROP(DT_INST(0, nordic_qspi_nor), size * 8)
#endif
#elif defined(CONFIG_FLASH_MCUX_FLEXSPI_NOR)

8
tests/drivers/flash/testcase.yaml
View file

@ -5,6 +5,14 @@ tests:
extra_args: OVERLAY_CONFIG=boards/nrf52840_flash_qspi.conf
integration_platforms:
- nrf52840dk_nrf52840
drivers.flash.nrf_qspi_nor.size_in_bytes:
platform_allow: nrf52840dk_nrf52840
tags: flash nrf52 nrf_qspi_fash
extra_args:
OVERLAY_CONFIG=boards/nrf52840_flash_qspi.conf
DTC_OVERLAY_FILE=boards/nrf52840_size_in_bytes.overlay
integration_platforms:
- nrf52840dk_nrf52840
drivers.flash.soc_flash_nrf:
platform_allow: nrf52840dk_nrf52840
tags: nrf52 soc_flash_nrf