djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

samd/boards: Rename flash pins consistently for QSPI and SPI. 

For SAMD21 devices, the board flash signals must be named in pins.csv as
FLASH_MOSI, FLASH_MISO, FLASH_SCK, FLASH_CS for creating the SPI object.

And rename the QSPI pins to QSPI_xxxx instead of FLASH_xxx.

Signed-off-by: robert-hh <robert@hammelrath.com>
This commit is contained in:
robert-hh 2023-05-24 16:13:01 +02:00 committed by Damien George
parent a79a6ab364
commit bf7d3ad8c6
6 changed files with 57 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
docs/samd/pinout.rst
View File

@ -160,14 +160,14 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM
22 PA22 D13 6 - - 3/0 5/1 4/0 1/6 0/2 22 PA22 D13 6 - - 3/0 5/1 4/0 1/6 0/2
34 PB02 DOTSTAR_CLK 2 14 - - 5/0 6/0 2/2 - 34 PB02 DOTSTAR_CLK 2 14 - - 5/0 6/0 2/2 -
35 PB03 DOTSTAR_DATA 9 15 - - 5/1 6/1 - - 35 PB03 DOTSTAR_DATA 9 15 - - 5/1 6/1 - -
43 PB11 FLASH_CS 12 - - - 4/3 5/1 0/5 1/1
11 PA11 FLASH_HOLD 11 11 - 0/3 2/3 1/1 0/3 1/7
9 PA09 FLASH_MISO 9 9 3 0/1 2/0 0/1 0/1 1/5
8 PA08 FLASH_MOSI - 8 2 0/0 2/1 0/0 0/0 1/4
42 PB10 FLASH_SCK 10 - - - 4/2 5/0 0/4 1/0
10 PA10 FLASH_WP 10 10 - 0/2 2/2 1/0 0/2 1/6
55 PB23 MISO 7 - - 1/3 5/3 7/1 - - 55 PB23 MISO 7 - - 1/3 5/3 7/1 - -
0 PA00 MOSI 0 - - - 1/0 2/0 - - 0 PA00 MOSI 0 - - - 1/0 2/0 - -
43 PB11 QSPI_CS 12 - - - 4/3 5/1 0/5 1/1
8 PA08 QSPI_D0 - 8 2 0/0 2/1 0/0 0/0 1/4
9 PA09 QSPI_D1 9 9 3 0/1 2/0 0/1 0/1 1/5
10 PA10 QSPI_D2 10 10 - 0/2 2/2 1/0 0/2 1/6
11 PA11 QSPI_D3 11 11 - 0/3 2/3 1/1 0/3 1/7
42 PB10 QSPI_SCK 10 - - - 4/2 5/0 0/4 1/0
1 PA01 SCK 1 - - - 1/1 2/1 - - 1 PA01 SCK 1 - - - 1/1 2/1 - -
13 PA13 SCL 13 - - 2/1 4/0 2/1 0/7 1/3 13 PA13 SCL 13 - - 2/1 4/0 2/1 0/7 1/3
12 PA12 SDA 12 - - 2/0 4/1 2/0 0/6 1/2 12 PA12 SDA 12 - - 2/0 4/1 2/0 0/6 1/2
@ -288,15 +288,15 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM
21 PA21 D11 5 - - 5/3 3/3 7/1 1/5 0/1 21 PA21 D11 5 - - 5/3 3/3 7/1 1/5 0/1
22 PA22 D12 6 - - 3/0 5/1 4/0 1/6 0/2 22 PA22 D12 6 - - 3/0 5/1 4/0 1/6 0/2
23 PA23 D13 7 - - 3/1 5/0 4/1 1/7 0/3 23 PA23 D13 7 - - 3/1 5/0 4/1 1/7 0/3
43 PB11 FLASH_CS 12 - - - 4/3 5/1 0/5 1/1
11 PA11 FLASH_HOLD 11 11 - 0/3 2/3 1/1 0/3 1/7
9 PA09 FLASH_MISO 9 9 3 0/1 2/0 0/1 0/1 1/5
8 PA08 FLASH_MOSI - 8 2 0/0 2/1 0/0 0/0 1/4
42 PB10 FLASH_SCK 10 - - - 4/2 5/0 0/4 1/0
10 PA10 FLASH_WP 10 10 - 0/2 2/2 1/0 0/2 1/6
54 PB22 MISO 22 - - 1/2 5/2 7/0 - - 54 PB22 MISO 22 - - 1/2 5/2 7/0 - -
55 PB23 MOSI 7 - - 1/3 5/3 7/1 - - 55 PB23 MOSI 7 - - 1/3 5/3 7/1 - -
35 PB03 NEOPIXEL 9 15 - - 5/1 6/1 - - 35 PB03 NEOPIXEL 9 15 - - 5/1 6/1 - -
43 PB11 QSPI_CS 12 - - - 4/3 5/1 0/5 1/1
8 PA08 QSPI_D0 - 8 2 0/0 2/1 0/0 0/0 1/4
9 PA09 QSPI_D1 9 9 3 0/1 2/0 0/1 0/1 1/5
10 PA10 QSPI_D2 10 10 - 0/2 2/2 1/0 0/2 1/6
11 PA11 QSPI_D3 11 11 - 0/3 2/3 1/1 0/3 1/7
42 PB10 QSPI_SCK 10 - - - 4/2 5/0 0/4 1/0
17 PA17 SCK 1 - - 1/1 3/0 2/1 1/1 0/5 17 PA17 SCK 1 - - 1/1 3/0 2/1 1/1 0/5
13 PA13 SCL 13 - - 2/1 4/0 2/1 0/7 1/3 13 PA13 SCL 13 - - 2/1 4/0 2/1 0/7 1/3
12 PA12 SDA 12 - - 2/0 4/1 2/0 0/6 1/2 12 PA12 SDA 12 - - 2/0 4/1 2/0 0/6 1/2
@ -650,6 +650,12 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM
15 PA15 LED 15 - - 2/3 4/3 3/1 2/1 1/3 15 PA15 LED 15 - - 2/3 4/3 3/1 2/1 1/3
55 PB23 MISO 7 - - 1/3 5/3 7/1 - - 55 PB23 MISO 7 - - 1/3 5/3 7/1 - -
54 PB22 MOSI 22 - - 1/2 5/2 7/0 - - 54 PB22 MOSI 22 - - 1/2 5/2 7/0 - -
43 PB11 QSPI_CS 12 - - - 4/3 5/1 0/5 1/1
8 PA08 QSPI_D0 - 8 2 0/0 2/1 0/0 0/0 1/4
9 PA09 QSPI_D1 9 9 3 0/1 2/0 0/1 0/1 1/5
10 PA10 QSPI_D2 10 10 - 0/2 2/2 1/0 0/2 1/6
11 PA11 QSPI_D3 11 11 - 0/3 2/3 1/1 0/3 1/7
42 PB10 QSPI_SCK 10 - - - 4/2 5/0 0/4 1/0
1 PA01 SCK 1 - - - 1/1 2/1 - - 1 PA01 SCK 1 - - - 1/1 2/1 - -
13 PA13 SCL 13 - - 2/1 4/0 2/1 0/7 1/3 13 PA13 SCL 13 - - 2/1 4/0 2/1 0/7 1/3
12 PA12 SDA 12 - - 2/0 4/1 2/0 0/6 1/2 12 PA12 SDA 12 - - 2/0 4/1 2/0 0/6 1/2
@ -657,17 +663,11 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM
31 PA31 SWDIO 15 - - 7/3 1/3 6/1 2/1 - 31 PA31 SWDIO 15 - - 7/3 1/3 6/1 2/1 -
24 PA24 USB_DM 8 - - 3/2 5/2 5/0 2/2 - 24 PA24 USB_DM 8 - - 3/2 5/2 5/0 2/2 -
25 PA25 USB_DP 9 - - 3/3 5/3 5/1 - - 25 PA25 USB_DP 9 - - 3/3 5/3 5/1 - -
8 PA08 - - 8 2 0/0 2/1 0/0 0/0 1/4
9 PA09 - 9 9 3 0/1 2/0 0/1 0/1 1/5
10 PA10 - 10 10 - 0/2 2/2 1/0 0/2 1/6
11 PA11 - 11 11 - 0/3 2/3 1/1 0/3 1/7
14 PA14 - 14 - - 2/2 4/2 3/0 2/0 1/2 14 PA14 - 14 - - 2/2 4/2 3/0 2/0 1/2
18 PA18 - 2 - - 1/2 3/2 3/0 1/2 0/6 18 PA18 - 2 - - 1/2 3/2 3/0 1/2 0/6
22 PA22 - 6 - - 3/0 5/1 4/0 1/6 0/2 22 PA22 - 6 - - 3/0 5/1 4/0 1/6 0/2
23 PA23 - 7 - - 3/1 5/0 4/1 1/7 0/3 23 PA23 - 7 - - 3/1 5/0 4/1 1/7 0/3
27 PA27 - 11 - - - - - - - 27 PA27 - 11 - - - - - - -
42 PB10 - 10 - - - 4/2 5/0 0/4 1/0
43 PB11 - 12 - - - 4/3 5/1 0/5 1/1
=== ==== ============ ==== ==== ==== ====== ====== ===== ===== ===== === ==== ============ ==== ==== ==== ====== ====== ===== ===== =====
For the definition of the table columns see the explanation at the table for For the definition of the table columns see the explanation at the table for
@ -734,6 +734,12 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM
117 PD21 SD_DET 11 - - 1/3 3/3 - 1/1 - 117 PD21 SD_DET 11 - - 1/3 3/3 - 1/1 -
83 PC19 SD_CS 3 - - 6/3 0/3 - 0/3 - 83 PC19 SD_CS 3 - - 6/3 0/3 - 0/3 -
82 PC18 SD_MISO 2 - - 6/2 0/2 - 0/2 - 82 PC18 SD_MISO 2 - - 6/2 0/2 - 0/2 -
43 PB11 QSPI_CS 12 - - - 4/3 5/1 0/5 1/1
8 PA08 QSPI_D0 - 8 2 0/0 2/1 0/0 0/0 1/4
9 PA09 QSPI_D1 9 9 3 0/1 2/0 0/1 0/1 1/5
10 PA10 QSPI_D2 10 10 - 0/2 2/2 1/0 0/2 1/6
11 PA11 QSPI_D3 11 11 - 0/3 2/3 1/1 0/3 1/7
42 PB10 QSPI_SCK 10 - - - 4/2 5/0 0/4 1/0
80 PC16 SD_MOSI 0 - - 6/0 0/1 - 0/0 - 80 PC16 SD_MOSI 0 - - 6/0 0/1 - 0/0 -
81 PC17 SD_SCK 1 - - 6/1 0/0 - 0/1 - 81 PC17 SD_SCK 1 - - 6/1 0/0 - 0/1 -
30 PA30 SWCLK 14 - - 7/2 1/2 6/0 2/0 - 30 PA30 SWCLK 14 - - 7/2 1/2 6/0 2/0 -
@ -750,17 +756,11 @@ Pin GPIO Pin name IRQ ADC ADC Serial Serial TC PWM PWM
2 PA02 - 2 0 - - - - - - 2 PA02 - 2 0 - - - - - -
3 PA03 - 3 10 - - - - - - 3 PA03 - 3 10 - - - - - -
5 PA05 - 5 5 - - 0/1 0/1 - - 5 PA05 - 5 5 - - 0/1 0/1 - -
8 PA08 - - 8 2 0/0 2/1 0/0 0/0 1/4
9 PA09 - 9 9 3 0/1 2/0 0/1 0/1 1/5
10 PA10 - 10 10 - 0/2 2/2 1/0 0/2 1/6
11 PA11 - 11 11 - 0/3 2/3 1/1 0/3 1/7
14 PA14 - 14 - - 2/2 4/2 3/0 2/0 1/2 14 PA14 - 14 - - 2/2 4/2 3/0 2/0 1/2
18 PA18 - 2 - - 1/2 3/2 3/0 1/2 0/6 18 PA18 - 2 - - 1/2 3/2 3/0 1/2 0/6
19 PA19 - 3 - - 1/3 3/3 3/1 1/3 0/7 19 PA19 - 3 - - 1/3 3/3 3/1 1/3 0/7
23 PA23 - 7 - - 3/1 5/0 4/1 1/7 0/3 23 PA23 - 7 - - 3/1 5/0 4/1 1/7 0/3
27 PA27 - 11 - - - - - - - 27 PA27 - 11 - - - - - - -
42 PB10 - 10 - - - 4/2 5/0 0/4 1/0
43 PB11 - 12 - - - 4/3 5/1 0/5 1/1
46 PB14 - 14 - - 4/2 - 5/0 4/0 0/2 46 PB14 - 14 - - 4/2 - 5/0 4/0 0/2
49 PB17 - 1 - - 5/1 - 6/1 3/1 0/5 49 PB17 - 1 - - 5/1 - 6/1 3/1 0/5
54 PB22 - 22 - - 1/2 5/2 7/0 - - 54 PB22 - 22 - - 1/2 5/2 7/0 - -

6
ports/samd/boards/ADAFRUIT_FEATHER_M0_EXPRESS/pins.csv
View File

@ -8,9 +8,9 @@ PIN_PB03,LED_RX
PIN_PA11,D0 PIN_PA11,D0
PIN_PA10,D1 PIN_PA10,D1
PIN_PA14,D2 PIN_PA08,FLASH_MOSI
PIN_PA09,D3 PIN_PA14,FLASH_MISO
PIN_PA08,D4 PIN_PA09,FLASH_SCK
PIN_PA15,D5 PIN_PA15,D5
PIN_PA20,D6 PIN_PA20,D6
PIN_PA21,D7 PIN_PA21,D7

1 # Pin rows contain Pin number and pin name.
8 PIN_PA10,D1
9 PIN_PA14,D2 PIN_PA08,FLASH_MOSI
10 PIN_PA09,D3 PIN_PA14,FLASH_MISO
11 PIN_PA08,D4 PIN_PA09,FLASH_SCK
12 PIN_PA15,D5
13 PIN_PA20,D6
14 PIN_PA21,D7
15 PIN_PA06,D8
16 PIN_PA07,D9

13
ports/samd/boards/ADAFRUIT_FEATHER_M4_EXPRESS/pins.csv
View File

@ -28,12 +28,13 @@ PIN_PA17,SCK
PIN_PB01,VDIV PIN_PB01,VDIV
PIN_PA03,AREF PIN_PA03,AREF
PIN_PB03,NEOPIXEL PIN_PB03,NEOPIXEL
PIN_PB11,FLASH_CS
PIN_PB10,FLASH_SCK PIN_PB11,QSPI_CS
PIN_PA08,FLASH_MOSI PIN_PB10,QSPI_SCK
PIN_PA09,FLASH_MISO PIN_PA08,QSPI_D0
PIN_PA10,FLASH_WP PIN_PA09,QSPI_D1
PIN_PA11,FLASH_HOLD PIN_PA10,QSPI_D2
PIN_PA11,QSPI_D3
PIN_PA24,USB_DM PIN_PA24,USB_DM
PIN_PA25,USB_DP PIN_PA25,USB_DP

1 # Pin rows contain Pin number and pin name.
28 PIN_PA03,AREF
29 PIN_PB03,NEOPIXEL
30 PIN_PB11,FLASH_CS PIN_PB11,QSPI_CS
31 PIN_PB10,FLASH_SCK PIN_PB10,QSPI_SCK
32 PIN_PA08,FLASH_MOSI PIN_PA08,QSPI_D0
33 PIN_PA09,FLASH_MISO PIN_PA09,QSPI_D1
34 PIN_PA10,FLASH_WP PIN_PA10,QSPI_D2
35 PIN_PA11,FLASH_HOLD PIN_PA11,QSPI_D3
36 PIN_PA24,USB_DM
37 PIN_PA25,USB_DP
38 PIN_PA25,USB_DP PIN_PA26,USB_SOF
39 PIN_PA26,USB_SOF PIN_PA30,SWCLK
40 PIN_PA30,SWCLK PIN_PA31,SWDIO

13
ports/samd/boards/ADAFRUIT_ITSYBITSY_M4_EXPRESS/pins.csv
View File

@ -28,12 +28,13 @@ PIN_PB23,MISO
PIN_PA01,SCK PIN_PA01,SCK
PIN_PB02,DOTSTAR_CLK PIN_PB02,DOTSTAR_CLK
PIN_PB03,DOTSTAR_DATA PIN_PB03,DOTSTAR_DATA
PIN_PB11,FLASH_CS
PIN_PB10,FLASH_SCK PIN_PB11,QSPI_CS
PIN_PA08,FLASH_MOSI PIN_PB10,QSPI_SCK
PIN_PA09,FLASH_MISO PIN_PA08,QSPI_D0
PIN_PA10,FLASH_WP PIN_PA09,QSPI_D1
PIN_PA11,FLASH_HOLD PIN_PA10,QSPI_D2
PIN_PA11,QSPI_D3
PIN_PA24,USB_DM PIN_PA24,USB_DM
PIN_PA25,USB_DP PIN_PA25,USB_DP

1 # Pin rows contain Pin number and pin name.
28 PIN_PB02,DOTSTAR_CLK
29 PIN_PB03,DOTSTAR_DATA
30 PIN_PB11,FLASH_CS PIN_PB11,QSPI_CS
31 PIN_PB10,FLASH_SCK PIN_PB10,QSPI_SCK
32 PIN_PA08,FLASH_MOSI PIN_PA08,QSPI_D0
33 PIN_PA09,FLASH_MISO PIN_PA09,QSPI_D1
34 PIN_PA10,FLASH_WP PIN_PA10,QSPI_D2
35 PIN_PA11,FLASH_HOLD PIN_PA11,QSPI_D3
36 PIN_PA24,USB_DM
37 PIN_PA25,USB_DP
38 PIN_PA25,USB_DP PIN_PA26,USB_SOF
39 PIN_PA26,USB_SOF PIN_PA30,SWCLK
40 PIN_PA30,SWCLK PIN_PA31,SWDIO

9
ports/samd/boards/MINISAM_M4/pins.csv
View File

@ -26,6 +26,15 @@ PIN_PA01,SCK
PIN_PB03,DOTSTAR_DATA PIN_PB03,DOTSTAR_DATA
PIN_PB02,DOTSTAR_CLK PIN_PB02,DOTSTAR_CLK
PIN_PB11,QSPI_CS
PIN_PB10,QSPI_SCK
PIN_PA08,QSPI_D0
PIN_PA09,QSPI_D1
PIN_PA10,QSPI_D2
PIN_PA11,QSPI_D3
PIN_PA15,LED
PIN_PA24,USB_DM PIN_PA24,USB_DM
PIN_PA25,USB_DP PIN_PA25,USB_DP
PIN_PA26,USB_SOF PIN_PA26,USB_SOF

1 # Pin rows contain Pin number and pin name.
26 PIN_PB02,DOTSTAR_CLK
27 PIN_PA24,USB_DM PIN_PB11,QSPI_CS
28 PIN_PA25,USB_DP PIN_PB10,QSPI_SCK
29 PIN_PA08,QSPI_D0
30 PIN_PA09,QSPI_D1
31 PIN_PA10,QSPI_D2
32 PIN_PA11,QSPI_D3
33 PIN_PA15,LED
34 PIN_PA24,USB_DM
35 PIN_PA25,USB_DP
36 PIN_PA26,USB_SOF
37 PIN_PA30,SWCLK
38 PIN_PA26,USB_SOF PIN_PA31,SWDIO
39
40

7
ports/samd/boards/SEEED_WIO_TERMINAL/pins.csv
View File

@ -58,6 +58,13 @@ PIN_PC13,LCD_YD
PIN_PC30,MIC PIN_PC30,MIC
PIN_PD11,BUZZER PIN_PD11,BUZZER
PIN_PB11,QSPI_CS
PIN_PB10,QSPI_SCK
PIN_PA08,QSPI_D0
PIN_PA09,QSPI_D1
PIN_PA10,QSPI_D2
PIN_PA11,QSPI_D3
PIN_PA15,LED_BLUE PIN_PA15,LED_BLUE
PIN_PC05,LED_LCD PIN_PC05,LED_LCD

1 # Pin rows contain Pin number and pin name.
58 PIN_PD11,BUZZER
59 PIN_PA15,LED_BLUE PIN_PB11,QSPI_CS
60 PIN_PC05,LED_LCD PIN_PB10,QSPI_SCK
61 PIN_PA08,QSPI_D0
62 PIN_PA09,QSPI_D1
63 PIN_PA10,QSPI_D2
64 PIN_PA11,QSPI_D3
65 PIN_PA15,LED_BLUE
66 PIN_PC05,LED_LCD
67 PIN_PA24,USB_DM
68 PIN_PA24,USB_DM PIN_PA25,USB_DP
69 PIN_PA25,USB_DP PIN_PA26,USB_SOF
70 PIN_PA26,USB_SOF PIN_PA30,SWCLK