ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #7817 from maciejbocianski/qspi_pinnames 

standardise QSPI pin names
pull/7635/merge
Martin Kojtal 2018-08-24 21:12:25 +02:00 committed by GitHub
parent 3065e2fce1 9a41043c0b
commit 31a6fb49bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
18 changed files with 155 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
TESTS/mbed_hal/qspi/main.cpp
View File

@ -66,12 +66,12 @@ uint8_t rx_buf[DATA_SIZE_1024];
// some target defines QSPI pins as integers thus conversion needed // some target defines QSPI pins as integers thus conversion needed
#define QPIN_0 static_cast<PinName>(QSPI_PIN_IO0) #define QPIN_0 static_cast<PinName>(QSPI_FLASH1_IO0)
#define QPIN_1 static_cast<PinName>(QSPI_PIN_IO1) #define QPIN_1 static_cast<PinName>(QSPI_FLASH1_IO1)
#define QPIN_2 static_cast<PinName>(QSPI_PIN_IO2) #define QPIN_2 static_cast<PinName>(QSPI_FLASH1_IO2)
#define QPIN_3 static_cast<PinName>(QSPI_PIN_IO3) #define QPIN_3 static_cast<PinName>(QSPI_FLASH1_IO3)
#define QSCK static_cast<PinName>(QSPI_PIN_SCK) #define QSCK static_cast<PinName>(QSPI_FLASH1_SCK)
#define QCSN static_cast<PinName>(QSPI_PIN_CSN) #define QCSN static_cast<PinName>(QSPI_FLASH1_CSN)
static void log_data(const char *str, uint8_t *data, uint32_t size) static void log_data(const char *str, uint8_t *data, uint32_t size)

21
targets/TARGET_NORDIC/TARGET_NRF5x/TARGET_NRF52/TARGET_MCU_NRF52840/TARGET_NRF52840_DK/PinNames.h
View File

@ -227,12 +227,21 @@ typedef enum {
A4 = p30, A4 = p30,
A5 = p31, A5 = p31,
QSPI_FLASH_IO0 = P0_20, /**** QSPI pins ****/
QSPI_FLASH_IO1 = P0_21, QSPI1_IO0 = P0_20,
QSPI_FLASH_IO2 = P0_22, QSPI1_IO1 = P0_21,
QSPI_FLASH_IO3 = P0_23, QSPI1_IO2 = P0_22,
QSPI_FLASH_SCK = P0_19, QSPI1_IO3 = P0_23,
QSPI_FLASH_CSN = P0_17, QSPI1_SCK = P0_19,
QSPI1_CSN = P0_17,
/**** QSPI FLASH pins ****/
QSPI_FLASH1_IO0 = QSPI1_IO0,
QSPI_FLASH1_IO1 = QSPI1_IO1,
QSPI_FLASH1_IO2 = QSPI1_IO2,
QSPI_FLASH1_IO3 = QSPI1_IO3,
QSPI_FLASH1_SCK = QSPI1_SCK,
QSPI_FLASH1_CSN = QSPI1_CSN,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF

8
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_NUCLEO_F412ZG/PinNames.h
View File

@ -307,6 +307,14 @@ typedef enum {
SYS_WKUP2 = PC_0, SYS_WKUP2 = PC_0,
SYS_WKUP3 = PC_1, SYS_WKUP3 = PC_1,
/**** QSPI pins ****/
QSPI1_IO0 = PD_11,
QSPI1_IO1 = PD_12,
QSPI1_IO2 = PE_2,
QSPI1_IO3 = PD_13,
QSPI1_SCK = PB_2,
QSPI1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

12
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/TARGET_DISCO_F413ZH/PinNames.h
View File

@ -304,12 +304,12 @@ typedef enum {
SYS_WKUP3 = PC_1, SYS_WKUP3 = PC_1,
/**** QSPI FLASH pins ****/ /**** QSPI FLASH pins ****/
QSPI_PIN_IO0 = PF_8, QSPI_FLASH1_IO0 = PF_8,
QSPI_PIN_IO1 = PF_9, QSPI_FLASH1_IO1 = PF_9,
QSPI_PIN_IO2 = PE_2, QSPI_FLASH1_IO2 = PE_2,
QSPI_PIN_IO3 = PD_13, QSPI_FLASH1_IO3 = PD_13,
QSPI_PIN_SCK = PB_2, QSPI_FLASH1_SCK = PB_2,
QSPI_PIN_CSN = PG_6, QSPI_FLASH1_CSN = PG_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF

8
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/TARGET_NUCLEO_F413ZH/PinNames.h
View File

@ -306,6 +306,14 @@ typedef enum {
SYS_WKUP2 = PC_0, SYS_WKUP2 = PC_0,
SYS_WKUP3 = PC_1, SYS_WKUP3 = PC_1,
/**** QSPI pins ****/
QSPI1_IO0 = PD_11,
QSPI1_IO1 = PD_12,
QSPI1_IO2 = PE_2,
QSPI1_IO3 = PD_13,
QSPI1_SCK = PB_2,
QSPI1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F446xE/TARGET_NUCLEO_F446ZE/PinNames.h
View File

@ -325,6 +325,14 @@ typedef enum {
SYS_WKUP0 = PA_0, SYS_WKUP0 = PA_0,
SYS_WKUP1 = PC_13, SYS_WKUP1 = PC_13,
/**** QSPI pins ****/
QSPI1_IO0 = PD_11,
QSPI1_IO1 = PD_12,
QSPI1_IO2 = PE_2,
QSPI1_IO3 = PD_13,
QSPI1_SCK = PB_2,
QSPI1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

13
targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F469xI/TARGET_DISCO_F469NI/PinNames.h
View File

@ -406,12 +406,13 @@ typedef enum {
SYS_TRACED3_ALT0 = PE_6, SYS_TRACED3_ALT0 = PE_6,
SYS_WKUP = PA_0, SYS_WKUP = PA_0,
QSPI_FLASH_IO0 = PF_8, /**** QSPI FLASH pins ****/
QSPI_FLASH_IO1 = PF_9, QSPI_FLASH1_IO0 = PF_8,
QSPI_FLASH_IO2 = PF_7, QSPI_FLASH1_IO1 = PF_9,
QSPI_FLASH_IO3 = PF_6, QSPI_FLASH1_IO2 = PF_7,
QSPI_FLASH_SCK = PF_10, QSPI_FLASH1_IO3 = PF_6,
QSPI_FLASH_CSN = PB_6, QSPI_FLASH1_SCK = PF_10,
QSPI_FLASH1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF

8
targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/TARGET_DISCO_F746NG/PinNames.h
View File

@ -420,6 +420,14 @@ typedef enum {
SYS_WKUP5 = PI_8, SYS_WKUP5 = PI_8,
SYS_WKUP6 = PI_11, SYS_WKUP6 = PI_11,
/**** QSPI FLASH pins ****/
QSPI_FLASH1_IO0 = PD_11,
QSPI_FLASH1_IO1 = PD_12,
QSPI_FLASH1_IO2 = PE_2,
QSPI_FLASH1_IO3 = PD_13,
QSPI_FLASH1_SCK = PB_2,
QSPI_FLASH1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F746xG/TARGET_NUCLEO_F746ZG/PinNames.h
View File

@ -354,6 +354,14 @@ typedef enum {
SYS_WKUP3 = PC_1, SYS_WKUP3 = PC_1,
SYS_WKUP4 = PC_13, SYS_WKUP4 = PC_13,
/**** QSPI pins ****/
QSPI_FLASH1_IO0 = PD_11,
QSPI_FLASH1_IO1 = PD_12,
QSPI_FLASH1_IO2 = PE_2,
QSPI_FLASH1_IO3 = PD_13,
QSPI_FLASH1_SCK = PB_2,
QSPI_FLASH1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F756xG/TARGET_NUCLEO_F756ZG/PinNames.h
View File

@ -354,6 +354,14 @@ typedef enum {
SYS_WKUP3 = PC_1, SYS_WKUP3 = PC_1,
SYS_WKUP4 = PC_13, SYS_WKUP4 = PC_13,
/**** QSPI pins ****/
QSPI1_IO0 = PD_11,
QSPI1_IO1 = PD_12,
QSPI1_IO2 = PE_2,
QSPI1_IO3 = PD_13,
QSPI1_SCK = PB_2,
QSPI1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F767xI/TARGET_NUCLEO_F767ZI/PinNames.h
View File

@ -359,6 +359,14 @@ typedef enum {
SYS_WKUP3 = PC_1, SYS_WKUP3 = PC_1,
SYS_WKUP4 = PC_13, SYS_WKUP4 = PC_13,
/**** QSPI pins ****/
QSPI1_IO0 = PD_11,
QSPI1_IO1 = PD_12,
QSPI1_IO2 = PE_2,
QSPI1_IO3 = PD_13,
QSPI1_SCK = PB_2,
QSPI1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32F7/TARGET_STM32F769xI/TARGET_DISCO_F769NI/PinNames.h
View File

@ -427,6 +427,14 @@ typedef enum {
SYS_WKUP5 = PI_8, SYS_WKUP5 = PI_8,
SYS_WKUP6 = PI_11, SYS_WKUP6 = PI_11,
/**** QSPI FLASH pins ****/
QSPI_FLASH1_IO0 = PC_9,
QSPI_FLASH1_IO1 = PC_10,
QSPI_FLASH1_IO2 = PE_2,
QSPI_FLASH1_IO3 = PD_13,
QSPI_FLASH1_SCK = PB_2,
QSPI_FLASH1_CSN = PB_6,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

9
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L432xC/TARGET_NUCLEO_L432KC/PinNames.h
View File

@ -159,6 +159,15 @@ typedef enum {
SYS_WKUP1 = PA_0, SYS_WKUP1 = PA_0,
SYS_WKUP4 = PA_2, SYS_WKUP4 = PA_2,
/**** QSPI pins ****/
QSPI1_IO0 = PB_1,
QSPI1_IO1 = PB_0,
QSPI1_IO2 = PA_7,
QSPI1_IO3 = PA_6,
QSPI1_SCK = PA_3,
QSPI1_CSN = PA_2,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L433xC/TARGET_NUCLEO_L433RC_P/PinNames.h
View File

@ -236,6 +236,14 @@ typedef enum {
SYS_WKUP2 = PC_13, SYS_WKUP2 = PC_13,
SYS_WKUP4 = PA_2, SYS_WKUP4 = PA_2,
/**** QSPI pins ****/
QSPI1_IO0 = PB_1,
QSPI1_IO1 = PB_0,
QSPI1_IO2 = PA_7,
QSPI1_IO3 = PA_6,
QSPI1_SCK = PB_10,
QSPI1_CSN = PB_11,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L475xG/TARGET_DISCO_L475VG_IOT01A/PinNames.h
View File

@ -282,6 +282,14 @@ typedef enum {
SYS_WKUP4 = PA_2, SYS_WKUP4 = PA_2,
SYS_WKUP5 = PC_5, SYS_WKUP5 = PC_5,
/**** QSPI FLASH pins ****/
QSPI_FLASH1_IO0 = PE_12,
QSPI_FLASH1_IO1 = PE_13,
QSPI_FLASH1_IO2 = PE_14,
QSPI_FLASH1_IO3 = PE_15,
QSPI_FLASH1_SCK = PE_10,
QSPI_FLASH1_CSN = PE_11,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

16
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L476xG/TARGET_DISCO_L476VG/PinNames.h
View File

@ -258,6 +258,22 @@ typedef enum {
SYS_WKUP4 = PA_2, SYS_WKUP4 = PA_2,
SYS_WKUP5 = PC_5, SYS_WKUP5 = PC_5,
/**** QSPI pins ****/
QSPI1_IO0 = PE_12,
QSPI1_IO1 = PE_13,
QSPI1_IO2 = PE_14,
QSPI1_IO3 = PE_15,
QSPI1_SCK = PE_10,
QSPI1_CSN = PE_11,
/**** QSPI FLASH pins ****/
QSPI_FLASH1_IO0 = QSPI1_IO0,
QSPI_FLASH1_IO1 = QSPI1_IO1,
QSPI_FLASH1_IO2 = QSPI1_IO2,
QSPI_FLASH1_IO3 = QSPI1_IO3,
QSPI_FLASH1_SCK = QSPI1_SCK,
QSPI_FLASH1_CSN = QSPI1_CSN,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_DISCO_L496AG/PinNames.h
View File

@ -341,6 +341,14 @@ typedef enum {
SYS_WKUP4 = PA_2, SYS_WKUP4 = PA_2,
SYS_WKUP5 = PC_5, SYS_WKUP5 = PC_5,
/**** QSPI FLASH pins ****/
QSPI_FLASH1_IO0 = PB_1,
QSPI_FLASH1_IO1 = PB_0,
QSPI_FLASH1_IO2 = PA_7,
QSPI_FLASH1_IO3 = PA_6,
QSPI_FLASH1_SCK = PB_11,
QSPI_FLASH1_CSN = PA_3,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;

8
targets/TARGET_STM/TARGET_STM32L4/TARGET_STM32L496xG/TARGET_NUCLEO_L496ZG/PinNames.h
View File

@ -317,6 +317,14 @@ typedef enum {
SYS_WKUP4 = PA_2, SYS_WKUP4 = PA_2,
SYS_WKUP5 = PC_5, SYS_WKUP5 = PC_5,
/**** QSPI pins ****/
QSPI1_IO0 = PE_12,
QSPI1_IO1 = PB_0,
QSPI1_IO2 = PE_14,
QSPI1_IO3 = PE_15,
QSPI1_SCK = PB_10,
QSPI1_CSN = PA_2,
// Not connected // Not connected
NC = (int)0xFFFFFFFF NC = (int)0xFFFFFFFF
} PinName; } PinName;