Skip to content

Commit a6509cf

Browse files
0xc01700xc0170
authored
Merge pull request #9438 from c1728p9/qspi_update
Use dedicated PinMap for each QSPI data line
2 parents 129889b + 82b131a commit a6509cf

File tree

28 files changed

+441
-196
lines changed

28 files changed

+441
-196
lines changed

‎targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_K82F/TARGET_FRDM/PeripheralPins.c

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -266,28 +266,39 @@ const PinMap PinMap_PWM[] = {
266266
{NC , NC , 0}
267267
};
268268

269-
const PinMap PinMap_QSPI_DATA[] = {
270-
{PTE0, QSPI_0, 5},
271-
{PTE2, QSPI_0, 5},
272-
{PTE3, QSPI_0, 5},
273-
{PTE4, QSPI_0, 5},
274-
{PTE6, QSPI_0, 5},
275-
{PTE7, QSPI_0, 5},
276-
{PTE8, QSPI_0, 5},
277-
{PTE9, QSPI_0, 5},
278-
{PTE10, QSPI_0, 5},
279-
{NC , NC , 0}
269+
const PinMap PinMap_QSPI_DATA0[] = {
270+
{PTE2, QSPI_0, 5}, // ALT5, QSPI0A_DATA0
271+
{PTE8, QSPI_0, 5}, // ALT5, QSPI0B_DATA0
272+
{NC, NC, 0}
273+
};
274+
275+
const PinMap PinMap_QSPI_DATA1[] = {
276+
{PTE4, QSPI_0, 5}, // ALT5, QSPI0A_DATA1
277+
{PTE10, QSPI_0, 5}, // ALT5, QSPI0B_DATA1
278+
{NC, NC, 0}
279+
};
280+
281+
const PinMap PinMap_QSPI_DATA2[] = {
282+
{PTE3, QSPI_0, 5}, // ALT5, QSPI0A_DATA2
283+
{PTE9, QSPI_0, 5}, // ALT5, QSPI0B_DATA2
284+
{NC, NC, 0}
285+
};
286+
287+
const PinMap PinMap_QSPI_DATA3[] = {
288+
{PTE0, QSPI_0, 5}, // ALT5, QSPI0A_DATA3
289+
{PTE6, QSPI_0, 5}, // ALT5, QSPI0B_DATA3
290+
{NC, NC, 0}
280291
};
281292

282293
const PinMap PinMap_QSPI_SCLK[] = {
283-
{PTE1, QSPI_0, 5},
284-
{PTE7, QSPI_0, 5},
294+
{PTE1, QSPI_0, 5}, // ALT5, QSPI0A_SCLK
295+
{PTE7, QSPI_0, 5}, // ALT5, QSPI0B_SCLK
285296
{NC , NC , 0}
286297
};
287298

288299
const PinMap PinMap_QSPI_SSEL[] = {
289-
{PTE5, QSPI_0, 5},
290-
{PTE11, QSPI_0, 5},
300+
{PTE5, QSPI_0, 5}, // ALT5, QSPI0A_SS0_B
301+
{PTE11, QSPI_0, 5}, // ALT5, QSPI0B_SS0_B
291302
{NC , NC , 0}
292303
};
293304

‎targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/TARGET_KL82Z/TARGET_FRDM/PeripheralPins.c

Lines changed: 26 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -158,28 +158,39 @@ const PinMap PinMap_PWM[] = {
158158
{NC , NC , 0}
159159
};
160160

161-
const PinMap PinMap_QSPI_DATA[] = {
162-
{PTE0, QSPI_0, 5},
163-
{PTE2, QSPI_0, 5},
164-
{PTE3, QSPI_0, 5},
165-
{PTE4, QSPI_0, 5},
166-
{PTE6, QSPI_0, 5},
167-
{PTE7, QSPI_0, 5},
168-
{PTE8, QSPI_0, 5},
169-
{PTE9, QSPI_0, 5},
170-
{PTE10, QSPI_0, 5},
171-
{NC , NC , 0}
161+
const PinMap PinMap_QSPI_DATA0[] = {
162+
{PTE2, QSPI_0, 5}, // ALT5, QSPI0A_DATA0
163+
{PTE8, QSPI_0, 5}, // ALT5, QSPI0B_DATA0
164+
{NC, NC, 0}
165+
};
166+
167+
const PinMap PinMap_QSPI_DATA1[] = {
168+
{PTE4, QSPI_0, 5}, // ALT5, QSPI0A_DATA1
169+
{PTE10, QSPI_0, 5}, // ALT5, QSPI0B_DATA1
170+
{NC, NC, 0}
171+
};
172+
173+
const PinMap PinMap_QSPI_DATA2[] = {
174+
{PTE3, QSPI_0, 5}, // ALT5, QSPI0A_DATA2
175+
{PTE9, QSPI_0, 5}, // ALT5, QSPI0B_DATA2
176+
{NC, NC, 0}
177+
};
178+
179+
const PinMap PinMap_QSPI_DATA3[] = {
180+
{PTE0, QSPI_0, 5}, // ALT5, QSPI0A_DATA3
181+
{PTE6, QSPI_0, 5}, // ALT5, QSPI0B_DATA3
182+
{NC, NC, 0}
172183
};
173184

174185
const PinMap PinMap_QSPI_SCLK[] = {
175-
{PTE1, QSPI_0, 5},
176-
{PTE7, QSPI_0, 5},
186+
{PTE1, QSPI_0, 5}, // ALT5, QSPI0A_SCLK
187+
{PTE7, QSPI_0, 5}, // ALT5, QSPI0B_SCLK
177188
{NC , NC , 0}
178189
};
179190

180191
const PinMap PinMap_QSPI_SSEL[] = {
181-
{PTE5, QSPI_0, 5},
182-
{PTE11, QSPI_0, 5},
192+
{PTE5, QSPI_0, 5}, // ALT5, QSPI0A_SS0_B
193+
{PTE11, QSPI_0, 5}, // ALT5, QSPI0B_SS0_B
183194
{NC , NC , 0}
184195
};
185196

‎targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/PeripheralPins.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,10 @@ extern const PinMap PinMap_PWM[];
4949

5050
#if DEVICE_QSPI
5151
/************QSPI***************/
52-
extern const PinMap PinMap_QSPI_DATA[];
52+
extern const PinMap PinMap_QSPI_DATA0[];
53+
extern const PinMap PinMap_QSPI_DATA1[];
54+
extern const PinMap PinMap_QSPI_DATA2[];
55+
extern const PinMap PinMap_QSPI_DATA3[];
5356
extern const PinMap PinMap_QSPI_SCLK[];
5457
extern const PinMap PinMap_QSPI_SSEL[];
5558
#endif

‎targets/TARGET_Freescale/TARGET_MCUXpresso_MCUS/api/qspi_api.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ qspi_status_t qspi_init(qspi_t *obj, PinName io0, PinName io1, PinName io2, PinN
5252
uint32_t clockSourceFreq = 0;
5353
qspi_config_t config = {0};
5454

55-
uint32_t qspiio0name = pinmap_peripheral(io0, PinMap_QSPI_DATA);
56-
uint32_t qspiio1name = pinmap_peripheral(io1, PinMap_QSPI_DATA);
57-
uint32_t qspiio2name = pinmap_peripheral(io2, PinMap_QSPI_DATA);
58-
uint32_t qspiio3name = pinmap_peripheral(io3, PinMap_QSPI_DATA);
55+
uint32_t qspiio0name = pinmap_peripheral(io0, PinMap_QSPI_DATA0);
56+
uint32_t qspiio1name = pinmap_peripheral(io1, PinMap_QSPI_DATA1);
57+
uint32_t qspiio2name = pinmap_peripheral(io2, PinMap_QSPI_DATA2);
58+
uint32_t qspiio3name = pinmap_peripheral(io3, PinMap_QSPI_DATA3);
5959
uint32_t qspiclkname = pinmap_peripheral(sclk, PinMap_QSPI_SCLK);
6060
uint32_t qspisselname = pinmap_peripheral(ssel, PinMap_QSPI_SSEL);
6161

@@ -89,10 +89,10 @@ qspi_status_t qspi_init(qspi_t *obj, PinName io0, PinName io1, PinName io2, PinN
8989

9090
qspi_frequency(obj, hz);
9191

92-
pinmap_pinout(io0, PinMap_QSPI_DATA);
93-
pinmap_pinout(io1, PinMap_QSPI_DATA);
94-
pinmap_pinout(io2, PinMap_QSPI_DATA);
95-
pinmap_pinout(io3, PinMap_QSPI_DATA);
92+
pinmap_pinout(io0, PinMap_QSPI_DATA0);
93+
pinmap_pinout(io1, PinMap_QSPI_DATA1);
94+
pinmap_pinout(io2, PinMap_QSPI_DATA2);
95+
pinmap_pinout(io3, PinMap_QSPI_DATA3);
9696

9797
pinmap_pinout(sclk, PinMap_QSPI_SCLK);
9898
pinmap_pinout(ssel, PinMap_QSPI_SSEL);

‎targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC/PeripheralPins.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,10 @@ extern const PinMap PinMap_PWM[];
5252

5353
#if DEVICE_QSPI
5454
/************QSPI***************/
55-
extern const PinMap PinMap_QSPI_DATA[];
55+
extern const PinMap PinMap_QSPI_DATA0[];
56+
extern const PinMap PinMap_QSPI_DATA1[];
57+
extern const PinMap PinMap_QSPI_DATA2[];
58+
extern const PinMap PinMap_QSPI_DATA3[];
5659
extern const PinMap PinMap_QSPI_SCLK[];
5760
extern const PinMap PinMap_QSPI_SSEL[];
5861
#endif

‎targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_LPC/qspi_api.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,10 @@ qspi_status_t qspi_init(qspi_t *obj, PinName io0, PinName io1, PinName io2, PinN
4343
{
4444
spifi_config_t config = {0};
4545

46-
uint32_t qspiio0name = pinmap_peripheral(io0, PinMap_QSPI_DATA);
47-
uint32_t qspiio1name = pinmap_peripheral(io1, PinMap_QSPI_DATA);
48-
uint32_t qspiio2name = pinmap_peripheral(io2, PinMap_QSPI_DATA);
49-
uint32_t qspiio3name = pinmap_peripheral(io3, PinMap_QSPI_DATA);
46+
uint32_t qspiio0name = pinmap_peripheral(io0, PinMap_QSPI_DATA0);
47+
uint32_t qspiio1name = pinmap_peripheral(io1, PinMap_QSPI_DATA1);
48+
uint32_t qspiio2name = pinmap_peripheral(io2, PinMap_QSPI_DATA2);
49+
uint32_t qspiio3name = pinmap_peripheral(io3, PinMap_QSPI_DATA3);
5050
uint32_t qspiclkname = pinmap_peripheral(sclk, PinMap_QSPI_SCLK);
5151
uint32_t qspisselname = pinmap_peripheral(ssel, PinMap_QSPI_SSEL);
5252

@@ -70,10 +70,10 @@ qspi_status_t qspi_init(qspi_t *obj, PinName io0, PinName io1, PinName io2, PinN
7070
// tested all combinations, take first
7171
obj->instance = qspi_data_first;
7272

73-
pinmap_pinout(io0, PinMap_QSPI_DATA);
74-
pinmap_pinout(io1, PinMap_QSPI_DATA);
75-
pinmap_pinout(io2, PinMap_QSPI_DATA);
76-
pinmap_pinout(io3, PinMap_QSPI_DATA);
73+
pinmap_pinout(io0, PinMap_QSPI_DATA0);
74+
pinmap_pinout(io1, PinMap_QSPI_DATA1);
75+
pinmap_pinout(io2, PinMap_QSPI_DATA2);
76+
pinmap_pinout(io3, PinMap_QSPI_DATA3);
7777

7878
pinmap_pinout(sclk, PinMap_QSPI_SCLK);
7979
pinmap_pinout(ssel, PinMap_QSPI_SSEL);

‎targets/TARGET_NXP/TARGET_MCUXpresso_MCUS/TARGET_MCU_LPC546XX/TARGET_LPCXpresso/PeripheralPins.c

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,12 +117,25 @@ const PinMap PinMap_PWM[] = {
117117
};
118118

119119
/************QSPI***************/
120-
const PinMap PinMap_QSPI_DATA[] = {
120+
121+
const PinMap PinMap_QSPI_DATA0[] = {
121122
{P0_24, QSPI_0, 6},
123+
{NC, NC, 0}
124+
};
125+
126+
const PinMap PinMap_QSPI_DATA1[] = {
122127
{P0_25, QSPI_0, 6},
128+
{NC, NC, 0}
129+
};
130+
131+
const PinMap PinMap_QSPI_DATA2[] = {
123132
{P0_28, QSPI_0, 6},
133+
{NC, NC, 0}
134+
};
135+
136+
const PinMap PinMap_QSPI_DATA3[] = {
124137
{P0_27, QSPI_0, 6},
125-
{NC , NC , 0}
138+
{NC, NC, 0}
126139
};
127140
const PinMap PinMap_QSPI_SCLK[] = {
128141
{P0_26, QSPI_0, 6},

‎targets/TARGET_STM/PeripheralPins.h

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,10 @@ extern const PinMap PinMap_CAN_TD[];
8181
#endif
8282

8383
#if DEVICE_QSPI
84-
extern const PinMap PinMap_QSPI_DATA[];
84+
extern const PinMap PinMap_QSPI_DATA0[];
85+
extern const PinMap PinMap_QSPI_DATA1[];
86+
extern const PinMap PinMap_QSPI_DATA2[];
87+
extern const PinMap PinMap_QSPI_DATA3[];
8588
extern const PinMap PinMap_QSPI_SCLK[];
8689
extern const PinMap PinMap_QSPI_SSEL[];
8790
#endif

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F412xG/TARGET_NUCLEO_F412ZG/PeripheralPins.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -350,21 +350,31 @@ MBED_WEAK const PinMap PinMap_CAN_TD[] = {
350350

351351
//*** QUADSPI ***
352352

353-
MBED_WEAK const PinMap PinMap_QSPI_DATA[] = {
354-
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
355-
{PB_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
356-
{PC_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
353+
MBED_WEAK const PinMap PinMap_QSPI_DATA0[] = {
357354
{PC_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
358-
{PC_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
359355
{PD_11, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
356+
{PF_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO0
357+
{NC, NC, 0}
358+
};
359+
360+
MBED_WEAK const PinMap PinMap_QSPI_DATA1[] = {
361+
{PC_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
360362
{PD_12, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
361-
{PD_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
363+
{PF_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO1
364+
{NC, NC, 0}
365+
};
366+
367+
MBED_WEAK const PinMap PinMap_QSPI_DATA2[] = {
368+
{PC_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
362369
{PE_2, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
363-
{PF_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
364370
{PF_7, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
365-
{PF_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO0
366-
{PF_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO1
367-
{PG_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS // Connected to USB_PowerSwitchOn [STMPS2151STR_EN]
371+
{NC, NC, 0}
372+
};
373+
374+
MBED_WEAK const PinMap PinMap_QSPI_DATA3[] = {
375+
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
376+
{PD_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
377+
{PF_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
368378
{NC, NC, 0}
369379
};
370380

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/TARGET_DISCO_F413ZH/PeripheralPins.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -402,21 +402,31 @@ MBED_WEAK const PinMap PinMap_CAN_TD[] = {
402402

403403
//*** QUADSPI ***
404404

405-
MBED_WEAK const PinMap PinMap_QSPI_DATA[] = {
406-
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3 // Connected to ARD_A1
407-
{PB_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS // Connected to ARD_D4
408-
{PC_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2 // Connected to SD_D0
405+
MBED_WEAK const PinMap PinMap_QSPI_DATA0[] = {
409406
{PC_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0 // Connected to SD_D1
410-
{PC_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1 // Connected to SD_D2
411407
{PD_11, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0 // Connected to PSRAM_A16 [IS66WV51216EBLL_A16]
408+
{PF_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO0 // Connected to QSPI_BK1_IO0 [N25Q128A13EF840F_DQ0]
409+
{NC, NC, 0}
410+
};
411+
412+
MBED_WEAK const PinMap PinMap_QSPI_DATA1[] = {
413+
{PC_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1 // Connected to SD_D2
412414
{PD_12, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1 // Connected to PSRAM_A17 [IS66WV51216EBLL_A17]
413-
{PD_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3 // Connected to QSPI_BK1_IO3 [N25Q128A13EF840F_DQ3]
415+
{PF_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO1 // Connected to QSPI_BK1_IO1 [N25Q128A13EF840F_DQ1]
416+
{NC, NC, 0}
417+
};
418+
419+
MBED_WEAK const PinMap PinMap_QSPI_DATA2[] = {
420+
{PC_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2 // Connected to SD_D0
414421
{PE_2, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2 // Connected to QSPI_BK1_IO2 [N25Q128A13EF840F_DQ2]
415-
{PF_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3 // Connected to ARD_D0
416422
{PF_7, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2 // Connected to ARD_D1
417-
{PF_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO0 // Connected to QSPI_BK1_IO0 [N25Q128A13EF840F_DQ0]
418-
{PF_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO1 // Connected to QSPI_BK1_IO1 [N25Q128A13EF840F_DQ1]
419-
{PG_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS // Connected to QSPI_BK1_NCS [N25Q128A13EF840F_S]
423+
{NC, NC, 0}
424+
};
425+
426+
MBED_WEAK const PinMap PinMap_QSPI_DATA3[] = {
427+
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3 // Connected to ARD_A1
428+
{PD_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3 // Connected to QSPI_BK1_IO3 [N25Q128A13EF840F_DQ3]
429+
{PF_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3 // Connected to ARD_D0
420430
{NC, NC, 0}
421431
};
422432

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F413xH/TARGET_NUCLEO_F413ZH/PeripheralPins.c

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -402,21 +402,31 @@ MBED_WEAK const PinMap PinMap_CAN_TD[] = {
402402

403403
//*** QUADSPI ***
404404

405-
MBED_WEAK const PinMap PinMap_QSPI_DATA[] = {
406-
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
407-
{PB_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
408-
{PC_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
405+
MBED_WEAK const PinMap PinMap_QSPI_DATA0[] = {
409406
{PC_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
410-
{PC_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
411407
{PD_11, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
408+
{PF_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO0
409+
{NC, NC, 0}
410+
};
411+
412+
MBED_WEAK const PinMap PinMap_QSPI_DATA1[] = {
413+
{PC_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
412414
{PD_12, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
413-
{PD_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
415+
{PF_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO1
416+
{NC, NC, 0}
417+
};
418+
419+
MBED_WEAK const PinMap PinMap_QSPI_DATA2[] = {
420+
{PC_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
414421
{PE_2, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
415-
{PF_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
416422
{PF_7, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO2
417-
{PF_8, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO0
418-
{PF_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_IO1
419-
{PG_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS // Connected to USB_PowerSwitchOn [STMPS2151STR_EN]
423+
{NC, NC, 0}
424+
};
425+
426+
MBED_WEAK const PinMap PinMap_QSPI_DATA3[] = {
427+
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
428+
{PD_13, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
429+
{PF_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
420430
{NC, NC, 0}
421431
};
422432

‎targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F446xE/TARGET_NUCLEO_F446RE/PeripheralPins.c

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -312,14 +312,25 @@ MBED_WEAK const PinMap PinMap_CAN_TD[] = {
312312

313313
//*** QUADSPI ***
314314

315-
MBED_WEAK const PinMap PinMap_QSPI_DATA[] = {
316-
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
317-
{PB_6, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF10_QSPI)}, // QUADSPI_BK1_NCS
315+
MBED_WEAK const PinMap PinMap_QSPI_DATA0[] = {
318316
{PC_9, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO0
317+
{NC, NC, 0}
318+
};
319+
320+
MBED_WEAK const PinMap PinMap_QSPI_DATA1[] = {
319321
{PC_10, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO1
320322
{NC, NC, 0}
321323
};
322324

325+
MBED_WEAK const PinMap PinMap_QSPI_DATA2[] = {
326+
{NC, NC, 0}
327+
};
328+
329+
MBED_WEAK const PinMap PinMap_QSPI_DATA3[] = {
330+
{PA_1, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_BK1_IO3
331+
{NC, NC, 0}
332+
};
333+
323334
MBED_WEAK const PinMap PinMap_QSPI_SCLK[] = {
324335
{PB_2, QSPI_1, STM_PIN_DATA(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF9_QSPI)}, // QUADSPI_CLK
325336
{NC, NC, 0}

0 commit comments

Comments
 (0)