zara
/
zephyr
mirror of https://github.com/zephyrproject-rtos/zephyr
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

drivers: flash_mspi_nor: Omit quad_enable_set() when QER is set to NONE 

When the quad-enable-requirements property is set to "NONE" or is not
present, no Quad Enable operation should be performed.
This fixes an issue with the mx25uw6345g flash chip that is present
on the nRF54h20 DK and supports the Single I/O mode, but cannot be
used in that mode.

Signed-off-by: Andrzej Głąbek <andrzej.glabek@nordicsemi.no>
pull/91962/head
Andrzej Głąbek 3 weeks ago committed by Carles Cufí
parent
48bbbfe976
commit
8415f7f7a7
1 changed files with 17 additions and 10 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 27
      drivers/flash/flash_mspi_nor.c

27
drivers/flash/flash_mspi_nor.c
Unescape View File

@ -567,15 +567,20 @@ static int default_io_mode(const struct device *dev)
enum mspi_io_mode io_mode = dev_config->mspi_nor_cfg.io_mode; enum mspi_io_mode io_mode = dev_config->mspi_nor_cfg.io_mode;
int rc = 0; int rc = 0;
/* For Quad 1-1-4 and 1-4-4, entering or leaving mode is defined in JEDEC216 BFP DW15 QER */ if (dev_config->dw15_qer != JESD216_DW15_QER_VAL_NONE) {
if (io_mode == MSPI_IO_MODE_SINGLE) { /* For Quad 1-1-4 and 1-4-4, entering or leaving mode is defined
rc = quad_enable_set(dev, false); * in JEDEC216 BFP DW15 QER
} else if ((io_mode == MSPI_IO_MODE_QUAD_1_1_4) || (io_mode == MSPI_IO_MODE_QUAD_1_4_4)) { */
rc = quad_enable_set(dev, true); if (io_mode == MSPI_IO_MODE_SINGLE) {
} rc = quad_enable_set(dev, false);
} else if (io_mode == MSPI_IO_MODE_QUAD_1_1_4 ||
io_mode == MSPI_IO_MODE_QUAD_1_4_4) {
rc = quad_enable_set(dev, true);
}
if (rc < 0) { if (rc < 0) {
LOG_ERR("Failed to modify Quad Enable bit: %d", rc); LOG_ERR("Failed to modify Quad Enable bit: %d", rc);
}
} }
if ((dev_config->quirks != NULL) && (dev_config->quirks->post_switch_mode != NULL)) { if ((dev_config->quirks != NULL) && (dev_config->quirks->post_switch_mode != NULL)) {
@ -646,8 +651,10 @@ static int flash_chip_init(const struct device *dev)
/* Some chips reuse RESET pin for data in Quad modes: /* Some chips reuse RESET pin for data in Quad modes:
* force single line mode before resetting. * force single line mode before resetting.
*/ */
if ((io_mode == MSPI_IO_MODE_SINGLE) || (io_mode == MSPI_IO_MODE_QUAD_1_1_4) || if (dev_config->dw15_qer != JESD216_DW15_QER_VAL_NONE &&
(io_mode == MSPI_IO_MODE_QUAD_1_4_4)) { (io_mode == MSPI_IO_MODE_SINGLE ||
io_mode == MSPI_IO_MODE_QUAD_1_1_4 ||
io_mode == MSPI_IO_MODE_QUAD_1_4_4)) {
rc = quad_enable_set(dev, false); rc = quad_enable_set(dev, false);
if (rc < 0) { if (rc < 0) {

Write Preview
Loading…
Cancel
Save