Skip to content

Commit 548a40e

Browse files
authored
Merge pull request #10541 from guialonsoalb/master
Adding QSPI support to target RHOMBIO_L476DMW1K
2 parents 2239bab + a1d785c commit 548a40e

File tree

3 files changed

+16
-7
lines changed

3 files changed

+16
-7
lines changed

TESTS/mbed_hal/qspi/flash_configs/flash_configs.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,14 @@
4040
#undef QSPI_CMD_WRITE_DPI
4141
#undef QSPI_CMD_WRITE_QPI
4242

43+
#elif defined(TARGET_RHOMBIO_L476DMW1K)
44+
#include "MT25Q_config.h" // MT25QL128ABA1EW7
45+
/* See STM32L476 Errata Sheet, it is not possible to use Dual-/Quad-mode for the command phase */
46+
#undef QSPI_CMD_READ_DPI
47+
#undef QSPI_CMD_READ_QPI
48+
#undef QSPI_CMD_WRITE_DPI
49+
#undef QSPI_CMD_WRITE_QPI
50+
4351
#elif defined(TARGET_DISCO_L496AG)
4452
#include "MX25RXX35F_config.h" // MX25R6435F
4553

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_RHOMBIO_L476DMW1K/PeripheralPins.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -347,36 +347,36 @@ MBED_WEAK const PinMap PinMap_CAN_TD[] = {
347347

348348
MBED_WEAK const PinMap PinMap_QSPI_DATA0[] = {
349349
{PB_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO0 // rhomb.io NMI
350-
{PE_12, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO0 // rhomb.io QSPI_IO0 // Connected to W25Q128JVPIQ
350+
{PE_12, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO0 // rhomb.io QSPI_IO0 // Connected to MT25QL128ABA1EW7
351351
{NC, NC, 0}
352352
};
353353

354354
MBED_WEAK const PinMap PinMap_QSPI_DATA1[] = {
355355
{PB_0, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO1 // rhomb.io AD3
356-
{PE_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO1 // rhomb.io QSPI_IO1 // Connected to W25Q128JVPIQ
356+
{PE_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO1 // rhomb.io QSPI_IO1 // Connected to MT25QL128ABA1EW7
357357
{NC, NC, 0}
358358
};
359359

360360
MBED_WEAK const PinMap PinMap_QSPI_DATA2[] = {
361361
{PA_7, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO2 // rhomb.io SPI_A_MOSI
362-
{PE_14, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO2 // rhomb.io QSPI_IO2 // Connected to W25Q128JVPIQ
362+
{PE_14, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO2 // rhomb.io QSPI_IO2 // Connected to MT25QL128ABA1EW7
363363
{NC, NC, 0}
364364
};
365365

366366
MBED_WEAK const PinMap PinMap_QSPI_DATA3[] = {
367367
{PA_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO3 // rhomb.io SPI_A_MISO
368-
{PE_15, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO3 // rhomb.io QSPI_IO3 // Connected to W25Q128JVPIQ
368+
{PE_15, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_BK1_IO3 // rhomb.io QSPI_IO3 // Connected to MT25QL128ABA1EW7
369369
{NC, NC, 0}
370370
};
371371

372372
MBED_WEAK const PinMap PinMap_QSPI_SCLK[] = {
373373
{PB_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_CLK // rhomb.io IO2
374-
{PE_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_CLK // rhomb.io QSPI_CLK // Connected to W25Q128JVPIQ
374+
{PE_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_CLK // rhomb.io QSPI_CLK // Connected to MT25QL128ABA1EW7
375375
{NC, NC, 0}
376376
};
377377

378378
MBED_WEAK const PinMap PinMap_QSPI_SSEL[] = {
379379
{PB_11, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_NCS // rhomb.io QSPI_CS0
380-
{PE_11, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_NCS // rhomb.io QSPI_MEM_CS // Connected to W25Q128JVPIQ
380+
{PE_11, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QUADSPI)}, // QUADSPI_NCS // rhomb.io QSPI_MEM_CS // Connected to MT25QL128ABA1EW7
381381
{NC, NC, 0}
382382
};

targets/targets.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4235,7 +4235,7 @@
42354235
"bootloader_supported": true
42364236
},
42374237
"RHOMBIO_L476DMW1K": {
4238-
"components_add": ["FLASHIAP"],
4238+
"components_add": ["QSPIF", "FLASHIAP"],
42394239
"inherits": ["FAMILY_STM32"],
42404240
"core": "Cortex-M4F",
42414241
"extra_labels_add": ["STM32L4", "STM32L476xG", "STM32L476VG"],
@@ -4263,6 +4263,7 @@
42634263
"SERIAL_FC",
42644264
"TRNG",
42654265
"FLASH",
4266+
"QSPI",
42664267
"MPU"
42674268
],
42684269
"release_versions": ["2", "5"],

0 commit comments

Comments
 (0)