Skip to content

Commit c34b6ce

Browse files
fpistmfpistm
committed
fix(variants): XSPI pinmap generation
Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 8ee19e8 commit c34b6ce

30 files changed

Lines changed: 1786 additions & 231 deletions

File tree

‎variants/STM32C5xx/C591C(E-G)(T-U)/PeripheralPins.c‎

Lines changed: 91 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,97 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
349349

350350
//*** No ETHERNET ***
351351

352-
//*** No QUADSPI ***
352+
//*** XSPI ***
353+
354+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
355+
WEAK const PinMap PinMap_XSPI_DATA0[] = {
356+
{PB_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO0
357+
{PB_15, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO0
358+
{NC, NP, 0}
359+
};
360+
#endif
361+
362+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
363+
WEAK const PinMap PinMap_XSPI_DATA1[] = {
364+
{PA_5, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO1
365+
{PB_0, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO1
366+
{NC, NP, 0}
367+
};
368+
#endif
369+
370+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
371+
WEAK const PinMap PinMap_XSPI_DATA2[] = {
372+
{PA_7, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO2
373+
{PE_2, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO2
374+
{NC, NP, 0}
375+
};
376+
#endif
377+
378+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
379+
WEAK const PinMap PinMap_XSPI_DATA3[] = {
380+
{PA_0, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO3
381+
{PA_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO3
382+
{PA_6, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO3
383+
{NC, NP, 0}
384+
};
385+
#endif
386+
387+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
388+
WEAK const PinMap PinMap_XSPI_DATA6[] = {
389+
{PA_8, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO6
390+
{NC, NP, 0}
391+
};
392+
#endif
393+
394+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
395+
WEAK const PinMap PinMap_XSPI_DATA7[] = {
396+
{PA_9, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO7
397+
{NC, NP, 0}
398+
};
399+
#endif
400+
401+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
402+
WEAK const PinMap PinMap_XSPI_SCLK[] = {
403+
{PA_3, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_CLK
404+
{PA_10, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_CLK
405+
{PB_2, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_CLK
406+
{PB_15, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_CLK
407+
{NC, NP, 0}
408+
};
409+
#endif
410+
411+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
412+
WEAK const PinMap PinMap_XSPI_NCS1[] = {
413+
{PA_5, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS1
414+
{PB_8, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS1
415+
{PB_10, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_NCS1
416+
{NC, NP, 0}
417+
};
418+
#endif
419+
420+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
421+
WEAK const PinMap PinMap_XSPI_NCS2[] = {
422+
{PA_11, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS2
423+
{NC, NP, 0}
424+
};
425+
#endif
426+
427+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
428+
WEAK const PinMap PinMap_XSPI_NCLK[] = {
429+
{PA_2, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCLK
430+
{PB_12, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCLK
431+
{NC, NP, 0}
432+
};
433+
#endif
434+
435+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
436+
WEAK const PinMap PinMap_XSPI_DQS[] = {
437+
{PA_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_DQS
438+
{PB_2, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_DQS
439+
{PB_13, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_DQS
440+
{NC, NP, 0}
441+
};
442+
#endif
353443

354444
//*** USB ***
355445

‎variants/STM32C5xx/C591C(E-G)(T-U)/variant_generic.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,9 @@
182182
#if !defined(HAL_I3C_MODULE_DISABLED)
183183
#define USE_HAL_I3C_MODULE 1U
184184
#endif
185+
#if !defined(HAL_XSPI_MODULE_DISABLED)
186+
#define USE_HAL_XSPI_MODULE 1U
187+
#endif
185188

186189
/*----------------------------------------------------------------------------
187190
* Arduino objects - C++ only

‎variants/STM32C5xx/C591K(E-G)T/PeripheralPins.c‎

Lines changed: 83 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,89 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
300300

301301
//*** No ETHERNET ***
302302

303-
//*** No QUADSPI ***
303+
//*** XSPI ***
304+
305+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
306+
WEAK const PinMap PinMap_XSPI_DATA0[] = {
307+
{PB_15, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO0
308+
{NC, NP, 0}
309+
};
310+
#endif
311+
312+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
313+
WEAK const PinMap PinMap_XSPI_DATA1[] = {
314+
{PA_5, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO1
315+
{PB_0, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO1
316+
{NC, NP, 0}
317+
};
318+
#endif
319+
320+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
321+
WEAK const PinMap PinMap_XSPI_DATA2[] = {
322+
{PA_7, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO2
323+
{NC, NP, 0}
324+
};
325+
#endif
326+
327+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
328+
WEAK const PinMap PinMap_XSPI_DATA3[] = {
329+
{PA_0, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO3
330+
{PA_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO3
331+
{PA_6, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO3
332+
{NC, NP, 0}
333+
};
334+
#endif
335+
336+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
337+
WEAK const PinMap PinMap_XSPI_DATA6[] = {
338+
{PA_8, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO6
339+
{NC, NP, 0}
340+
};
341+
#endif
342+
343+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
344+
WEAK const PinMap PinMap_XSPI_DATA7[] = {
345+
{PA_9, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO7
346+
{NC, NP, 0}
347+
};
348+
#endif
349+
350+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
351+
WEAK const PinMap PinMap_XSPI_SCLK[] = {
352+
{PA_3, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_CLK
353+
{PB_15, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_CLK
354+
{NC, NP, 0}
355+
};
356+
#endif
357+
358+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
359+
WEAK const PinMap PinMap_XSPI_NCS1[] = {
360+
{PA_5, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS1
361+
{PB_8, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS1
362+
{NC, NP, 0}
363+
};
364+
#endif
365+
366+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
367+
WEAK const PinMap PinMap_XSPI_NCS2[] = {
368+
{PA_11, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS2
369+
{NC, NP, 0}
370+
};
371+
#endif
372+
373+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
374+
WEAK const PinMap PinMap_XSPI_NCLK[] = {
375+
{PA_2, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCLK
376+
{NC, NP, 0}
377+
};
378+
#endif
379+
380+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
381+
WEAK const PinMap PinMap_XSPI_DQS[] = {
382+
{PA_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_DQS
383+
{NC, NP, 0}
384+
};
385+
#endif
304386

305387
//*** USB ***
306388

‎variants/STM32C5xx/C591K(E-G)T/variant_generic.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@
162162
#if !defined(HAL_I3C_MODULE_DISABLED)
163163
#define USE_HAL_I3C_MODULE 1U
164164
#endif
165+
#if !defined(HAL_XSPI_MODULE_DISABLED)
166+
#define USE_HAL_XSPI_MODULE 1U
167+
#endif
165168

166169
/*----------------------------------------------------------------------------
167170
* Arduino objects - C++ only

‎variants/STM32C5xx/C591K(E-G)U/PeripheralPins.c‎

Lines changed: 84 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -309,7 +309,90 @@ WEAK const PinMap PinMap_SPI_SSEL[] = {
309309

310310
//*** No ETHERNET ***
311311

312-
//*** No QUADSPI ***
312+
//*** XSPI ***
313+
314+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
315+
WEAK const PinMap PinMap_XSPI_DATA0[] = {
316+
{PB_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO0
317+
{PB_15, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO0
318+
{NC, NP, 0}
319+
};
320+
#endif
321+
322+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
323+
WEAK const PinMap PinMap_XSPI_DATA1[] = {
324+
{PA_5, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO1
325+
{PB_0, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO1
326+
{NC, NP, 0}
327+
};
328+
#endif
329+
330+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
331+
WEAK const PinMap PinMap_XSPI_DATA2[] = {
332+
{PA_7, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO2
333+
{NC, NP, 0}
334+
};
335+
#endif
336+
337+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
338+
WEAK const PinMap PinMap_XSPI_DATA3[] = {
339+
{PA_0, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO3
340+
{PA_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO3
341+
{PA_6, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_9)}, // XSPI1_IO3
342+
{NC, NP, 0}
343+
};
344+
#endif
345+
346+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
347+
WEAK const PinMap PinMap_XSPI_DATA6[] = {
348+
{PA_8, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO6
349+
{NC, NP, 0}
350+
};
351+
#endif
352+
353+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
354+
WEAK const PinMap PinMap_XSPI_DATA7[] = {
355+
{PA_9, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_IO7
356+
{NC, NP, 0}
357+
};
358+
#endif
359+
360+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
361+
WEAK const PinMap PinMap_XSPI_SCLK[] = {
362+
{PA_3, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_CLK
363+
{PB_15, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_CLK
364+
{NC, NP, 0}
365+
};
366+
#endif
367+
368+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
369+
WEAK const PinMap PinMap_XSPI_NCS1[] = {
370+
{PA_5, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS1
371+
{PB_8, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS1
372+
{NC, NP, 0}
373+
};
374+
#endif
375+
376+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
377+
WEAK const PinMap PinMap_XSPI_NCS2[] = {
378+
{PA_11, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCS2
379+
{NC, NP, 0}
380+
};
381+
#endif
382+
383+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
384+
WEAK const PinMap PinMap_XSPI_NCLK[] = {
385+
{PA_2, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_NCLK
386+
{NC, NP, 0}
387+
};
388+
#endif
389+
390+
#if defined(USE_HAL_XSPI_MODULE) && (USE_HAL_XSPI_MODULE == 1U)
391+
WEAK const PinMap PinMap_XSPI_DQS[] = {
392+
{PA_1, XSPI1, STM_PIN_DATA(STM_MODE_AF_PP, LL_GPIO_PULL_UP, HAL_GPIO_AF_11)}, // XSPI1_DQS
393+
{NC, NP, 0}
394+
};
395+
#endif
313396

314397
//*** USB ***
315398

‎variants/STM32C5xx/C591K(E-G)U/variant_generic.h‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -166,6 +166,9 @@
166166
#if !defined(HAL_I3C_MODULE_DISABLED)
167167
#define USE_HAL_I3C_MODULE 1U
168168
#endif
169+
#if !defined(HAL_XSPI_MODULE_DISABLED)
170+
#define USE_HAL_XSPI_MODULE 1U
171+
#endif
169172

170173
/*----------------------------------------------------------------------------
171174
* Arduino objects - C++ only

0 commit comments

Comments
 (0)