Skip to content

Commit 59165d2

Browse files
committed
Test montage QSPI volant
Test QSPI Ok avec QSPI2 + PF0/1/2/3/4 + PG12
1 parent 8cd00b3 commit 59165d2

File tree

6 files changed

+75
-1
lines changed

6 files changed

+75
-1
lines changed

TESTS/mbed_hal/qspi/flash_configs/MX25RXX35F_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
#define QSPI_ERASE_BLOCK_64_MAX_TIME 4025000 // 3.5s
8383

8484
// max frequency for basic rw operation (for fast mode)
85-
#define QSPI_COMMON_MAX_FREQUENCY 32000000
85+
#define QSPI_COMMON_MAX_FREQUENCY 2000000
8686

8787
#define QSPI_STATUS_REG_SIZE 1
8888
#define QSPI_CONFIG_REG_0_SIZE 2

TESTS/mbed_hal/qspi/flash_configs/flash_configs.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
#if defined(TARGET_DISCO_L475VG_IOT01A)
2121
#include "MX25RXX35F_config.h" // MX25R6435F
2222

23+
#elif defined(TARGET_NUCLEO_L4R5ZI_P)
24+
#include "MX25RXX35F_config.h" // MX25R6435F
25+
2326
#elif defined(TARGET_DISCO_F413ZH)
2427
#include "N25Q128A_config.h" // N25Q128A13EF840F
2528

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/PeripheralNames.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,11 @@ typedef enum {
8383
CAN_1 = (int)CAN1_BASE
8484
} CANName;
8585

86+
typedef enum {
87+
QSPI_1 = (int)OCTOSPI1_R_BASE,
88+
QSPI_2 = (int)OCTOSPI2_R_BASE
89+
} QSPIName;
90+
8691
#ifdef __cplusplus
8792
}
8893
#endif

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/PeripheralPins.c

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -376,3 +376,46 @@ MBED_WEAK const PinMap PinMap_CAN_TD[] = {
376376
{PD_1, CAN_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF9_CAN1)},
377377
{NC, NC, 0}
378378
};
379+
380+
381+
//*** QUADSPI ***
382+
MBED_WEAK const PinMap PinMap_QSPI_DATA0[] = {
383+
{PE_12, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_BK1_IO0
384+
{PF_0, QSPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_OCTOSPIM_P2)}, // QUADSPI_BK1_IO0
385+
{NC, NC, 0}
386+
};
387+
388+
MBED_WEAK const PinMap PinMap_QSPI_DATA1[] = {
389+
{PB_0, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_BK1_IO1
390+
{PF_1, QSPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_OCTOSPIM_P2)}, // QUADSPI_BK1_IO0
391+
{NC, NC, 0}
392+
};
393+
394+
MBED_WEAK const PinMap PinMap_QSPI_DATA2[] = {
395+
{PE_14, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_BK1_IO2
396+
{PF_2, QSPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_OCTOSPIM_P2)}, // QUADSPI_BK1_IO0
397+
{NC, NC, 0}
398+
};
399+
400+
MBED_WEAK const PinMap PinMap_QSPI_DATA3[] = {
401+
{PE_15, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_BK1_IO3
402+
{PF_3, QSPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_OCTOSPIM_P2)}, // QUADSPI_BK1_IO0
403+
{NC, NC, 0}
404+
};
405+
406+
MBED_WEAK const PinMap PinMap_QSPI_SCLK[] = {
407+
{PA_3, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_CLK
408+
{PB_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_CLK
409+
{PF_4, QSPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_OCTOSPIM_P2)}, // QUADSPI_BK1_IO0
410+
{NC, NC, 0}
411+
};
412+
413+
MBED_WEAK const PinMap PinMap_QSPI_SSEL[] = {
414+
{PE_11, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_NCS
415+
{PA_2, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_OCTOSPIM_P1)}, // QUADSPI_NCS
416+
{PG_12, QSPI_2, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_NOPULL, GPIO_AF5_OCTOSPIM_P2)}, // QUADSPI_BK1_IO0
417+
{NC, NC, 0}
418+
};
419+
420+
421+

targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L4R5xI/TARGET_NUCLEO_L4R5ZI/PinNames.h

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -320,6 +320,24 @@ typedef enum {
320320
SYS_WKUP4 = PA_2,
321321
SYS_WKUP5 = PC_5,
322322

323+
/**** QSPI FLASH pins ****/
324+
/* OSPI1
325+
QSPI_FLASH1_IO0 = PE_12,
326+
QSPI_FLASH1_IO1 = PB_0,
327+
QSPI_FLASH1_IO2 = PE_14,
328+
QSPI_FLASH1_IO3 = PE_15,
329+
QSPI_FLASH1_SCK = PA_3,
330+
QSPI_FLASH1_CSN = PE_11,
331+
*/
332+
333+
/* OSPI2 */
334+
QSPI_FLASH1_IO0 = PF_0,
335+
QSPI_FLASH1_IO1 = PF_1,
336+
QSPI_FLASH1_IO2 = PF_2,
337+
QSPI_FLASH1_IO3 = PF_3,
338+
QSPI_FLASH1_SCK = PF_4,
339+
QSPI_FLASH1_CSN = PG_12,
340+
323341
// Not connected
324342
NC = (int)0xFFFFFFFF
325343
} PinName;

targets/targets.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7924,6 +7924,10 @@
79247924
"MBED_TICKLESS",
79257925
"EXTRA_IDLE_STACK_REQUIRED"
79267926
],
7927+
"components_add": [
7928+
"QSPIF",
7929+
"FLASHIAP"
7930+
],
79277931
"overrides": { "lpticker_delay_ticks": 0 },
79287932
"detect_code": ["0776"],
79297933
"device_has_add": [
@@ -7933,6 +7937,7 @@
79337937
"SERIAL_ASYNCH",
79347938
"TRNG",
79357939
"FLASH",
7940+
"QSPI",
79367941
"MPU"
79377942
],
79387943
"release_versions": ["2", "5"],

0 commit comments

Comments
 (0)