From 248b49c6e58dcadfd1d86e2b5f9e6cb11fe93d21 Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Fri, 8 Nov 2024 11:00:24 +0000 Subject: [PATCH 1/5] Update pinmux mapping diagram to map RPH SPI CE0&1 correctly This is already correct in `top_config.toml`, but the diagram gets these two chip enables the wrong way around and doesn't match the actual config correctly. --- doc/ip/pinmux/pin_mappings.dot | 12 +- doc/ip/pinmux/pin_mappings.svg | 2097 ++++++++++++++++---------------- 2 files changed, 1055 insertions(+), 1054 deletions(-) diff --git a/doc/ip/pinmux/pin_mappings.dot b/doc/ip/pinmux/pin_mappings.dot index 546aafe18..d29eca637 100644 --- a/doc/ip/pinmux/pin_mappings.dot +++ b/doc/ip/pinmux/pin_mappings.dot @@ -215,8 +215,8 @@ digraph { rph_g4gpio rph_g5gpio rph_g6gpio - rph_g7_spi0_ce0gpio, cs - rph_g8_spi0_ce1gpio, cs + rph_g7_spi0_ce1gpio, cs + rph_g8_spi0_ce0gpio, cs rph_g9_spi0_cipogpio, cipo rph_g10_spi0_copigpio, copi rph_g11_spi0_sclkgpio, sclk @@ -415,8 +415,8 @@ digraph { spi_0:copi -> rph:g10_spi0_copi; spi_0:cipo -> rph:g9_spi0_cipo [dir=back]; spi_0:sclk -> rph:g11_spi0_sclk; - spi_0:cs_0 -> rph:g7_spi0_ce0; - spi_0:cs_1 -> rph:g8_spi0_ce1; + spi_0:cs_1 -> rph:g7_spi0_ce1; + spi_0:cs_0 -> rph:g8_spi0_ce0; spi_0:copi -> ah:tmpio11; spi_0:cipo -> ah:tmpio12 [dir=back]; @@ -485,8 +485,8 @@ digraph { gpio_rph:"gpio_0-27" -> rph:g4; gpio_rph:"gpio_0-27" -> rph:g5; gpio_rph:"gpio_0-27" -> rph:g6; - gpio_rph:"gpio_0-27" -> rph:g7_spi0_ce0; - gpio_rph:"gpio_0-27" -> rph:g8_spi0_ce1; + gpio_rph:"gpio_0-27" -> rph:g7_spi0_ce1; + gpio_rph:"gpio_0-27" -> rph:g8_spi0_ce0; gpio_rph:"gpio_0-27" -> rph:g9_spi0_cipo; gpio_rph:"gpio_0-27" -> rph:g10_spi0_copi; gpio_rph:"gpio_0-27" -> rph:g11_spi0_sclk; diff --git a/doc/ip/pinmux/pin_mappings.svg b/doc/ip/pinmux/pin_mappings.svg index b57e304f1..e0040a955 100644 --- a/doc/ip/pinmux/pin_mappings.svg +++ b/doc/ip/pinmux/pin_mappings.svg @@ -1,1846 +1,1847 @@ - - - - - + + + +%3 + uart_0 - -uart_0 - -tx - -rx + +uart_0 + +tx + +rx usb - -ser0_tx - -tx - -main usb - -ser0_rx - -rx - -ser1_tx - -tx - -ser1_rx - -rx + +ser0_tx + +tx + +main usb + +ser0_rx + +rx + +ser1_tx + +tx + +ser1_rx + +rx uart_0:tx->usb:ser0_tx - - + + uart_0:rx->usb:ser0_rx - - + + uart_1 - -uart_1 - -tx - -rx + +uart_1 + +tx + +rx uart_1:tx->usb:ser1_tx - - + + uart_1:rx->usb:ser1_rx - - + + rph - -rph_g0 - -gpio, sda - -Raspberry Pi HAT - -rph_g1 - -gpio, scl - -rph_g2_sda - -gpio, sda - -rph_g3_scl - -gpio, scl - -rph_g4 - -gpio - -rph_g5 - -gpio - -rph_g6 - -gpio - -rph_g7_spi0_ce0 - -gpio, cs - -rph_g8_spi0_ce1 - -gpio, cs - -rph_g9_spi0_cipo - -gpio, cipo - -rph_g10_spi0_copi - -gpio, copi - -rph_g11_spi0_sclk - -gpio, sclk - -rph_g12 - -gpio, pwm - -rph_g13 - -gpio, pwm - -rph_txd0 - -gpio, tx - -rph_rxd0 - -gpio, rx - -rph_g16_spi1_ce2 - -gpio, cs - -rph_g17_spi1_ce1 - -gpio, cs - -rph_g18_spi1_ce0 - -gpio, cs, pwm - -rph_g19_spi1_cipo - -gpio, cipo, pwm - -rph_g20_spi1_copi - -gpio, copi, pwm - -rph_g21_spi1_sclk - -gpio, sclk, pwm - -rph_g22 - -gpio - -rph_g23 - -gpio - -rph_g24 - -gpio - -rph_g25 - -gpio - -rph_g26 - -gpio - -rph_g27 - -gpio + +rph_g0 + +gpio, sda + +Raspberry Pi HAT + +rph_g1 + +gpio, scl + +rph_g2_sda + +gpio, sda + +rph_g3_scl + +gpio, scl + +rph_g4 + +gpio + +rph_g5 + +gpio + +rph_g6 + +gpio + +rph_g7_spi0_ce1 + +gpio, cs + +rph_g8_spi0_ce0 + +gpio, cs + +rph_g9_spi0_cipo + +gpio, cipo + +rph_g10_spi0_copi + +gpio, copi + +rph_g11_spi0_sclk + +gpio, sclk + +rph_g12 + +gpio, pwm + +rph_g13 + +gpio, pwm + +rph_txd0 + +gpio, tx + +rph_rxd0 + +gpio, rx + +rph_g16_spi1_ce2 + +gpio, cs + +rph_g17_spi1_ce1 + +gpio, cs + +rph_g18_spi1_ce0 + +gpio, cs, pwm + +rph_g19_spi1_cipo + +gpio, cipo, pwm + +rph_g20_spi1_copi + +gpio, copi, pwm + +rph_g21_spi1_sclk + +gpio, sclk, pwm + +rph_g22 + +gpio + +rph_g23 + +gpio + +rph_g24 + +gpio + +rph_g25 + +gpio + +rph_g26 + +gpio + +rph_g27 + +gpio uart_1:tx->rph:txd0 - - + + uart_1:rx->rph:rxd0 - - + + ah - -ah_tmpio0 - -gpio, rx - -Arduino Shield - -ah_tmpio1 - -gpio, tx - -ah_tmpio2 - -gpio - -ah_tmpio3 - -gpio, pwm - -ah_tmpio4 - -gpio - -ah_tmpio5 - -gpio, pwm - -ah_tmpio6 - -gpio, pwm - -ah_tmpio7 - -gpio - -ah_tmpio8 - -gpio - -ah_tmpio9 - -gpio, pwm - -ah_tmpio10 - -gpio, pwm, cs - -ah_tmpio11 - -gpio, pwm, copi - -ah_tmpio12 - -gpio, cipo - -ah_tmpio13 - -gpio, sclk + +ah_tmpio0 + +gpio, rx + +Arduino Shield + +ah_tmpio1 + +gpio, tx + +ah_tmpio2 + +gpio + +ah_tmpio3 + +gpio, pwm + +ah_tmpio4 + +gpio + +ah_tmpio5 + +gpio, pwm + +ah_tmpio6 + +gpio, pwm + +ah_tmpio7 + +gpio + +ah_tmpio8 + +gpio + +ah_tmpio9 + +gpio, pwm + +ah_tmpio10 + +gpio, pwm, cs + +ah_tmpio11 + +gpio, pwm, copi + +ah_tmpio12 + +gpio, cipo + +ah_tmpio13 + +gpio, sclk uart_1:tx->ah:tmpio1 - - + + uart_1:rx->ah:tmpio0 - - + + mb - -mb0 - - -mikroBUS Click - -mb1 - -cs - -mb2 - -sclk - -mb3 - -cipo - -mb4 - -copi - -mb5 - -sda - -mb6 - -scl - -mb7 - -tx - -mb8 - -rx - -mb9 - -mb10 - -pwm + +mb0 + + +mikroBUS Click + +mb1 + +cs + +mb2 + +sclk + +mb3 + +cipo + +mb4 + +copi + +mb5 + +sda + +mb6 + +scl + +mb7 + +tx + +mb8 + +rx + +mb9 + +mb10 + +pwm uart_1:tx->mb:7 - - + + uart_1:rx->mb:8 - - + + pmod0 - -pmod0_1 - -gpio, cs - -Pmod 0 -types 1A, 2A, 3A or 6A - -pmod0_2 - -gpio, copi, pwm, tx - -pmod0_3 - -gpio, cipo, scl, rx - -pmod0_4 - -gpio, sclk, sda - -pmod0_5 - -gpio - -pmod0_6 - -gpio, pwm - -pmod0_7 - -gpio, cs - -pmod0_8 - -gpio, cs + +pmod0_1 + +gpio, cs + +Pmod 0 +types 1A, 2A, 3A or 6A + +pmod0_2 + +gpio, copi, pwm, tx + +pmod0_3 + +gpio, cipo, scl, rx + +pmod0_4 + +gpio, sclk, sda + +pmod0_5 + +gpio + +pmod0_6 + +gpio, pwm + +pmod0_7 + +gpio, cs + +pmod0_8 + +gpio, cs uart_1:tx->pmod0:2 - - + + uart_1:rx->pmod0:3 - - + + uart_2 - -uart_2 - -tx - -rx + +uart_2 + +tx + +rx uart_2:tx->usb:ser1_tx - - + + uart_2:rx->usb:ser1_rx - - + + rs232 - -rs232_tx - -tx - -rs232 - -rs232_rx - -rx + +rs232_tx + +tx + +rs232 + +rs232_rx + +rx uart_2:tx->rs232:tx - - + + uart_2:rx->rs232:rx - - + + pmod1 - -pmod1_1 - -gpio, cs - -Pmod 1 -types 1A, 2A, 3A or 6A - -pmod1_2 - -gpio, copi, pwm, tx - -pmod1_3 - -gpio, cipo, scl, rx - -pmod1_4 - -gpio, sclk, sca - -pmod1_5 - -gpio - -pmod1_6 - -gpio, pwm - -pmod1_7 - -gpio, cs - -pmod1_8 - -gpio, cs + +pmod1_1 + +gpio, cs + +Pmod 1 +types 1A, 2A, 3A or 6A + +pmod1_2 + +gpio, copi, pwm, tx + +pmod1_3 + +gpio, cipo, scl, rx + +pmod1_4 + +gpio, sclk, sca + +pmod1_5 + +gpio + +pmod1_6 + +gpio, pwm + +pmod1_7 + +gpio, cs + +pmod1_8 + +gpio, cs uart_2:tx->pmod1:2 - - + + uart_2:rx->pmod1:3 - - + + i2c_0 - -i2c_0 - -sda - -scl + +i2c_0 + +sda + +scl qwiic - -sda0 - -sda - -qwiic - -scl0 - -scl - -sda1 - -sda - -scl1 - -scl + +sda0 + +sda + +qwiic + +scl0 + +scl + +sda1 + +sda + +scl1 + +scl i2c_0:sda->qwiic:sda0 - - - + + + i2c_0:scl->qwiic:scl0 - - - + + + i2c_0:sda->rph:g0 - - - + + + i2c_0:scl->rph:g1 - - - + + + i2c_0:sda->pmod0:4 - - - + + + i2c_0:scl->pmod0:3 - - - + + + i2c_1 - -i2c_1 - -sda - -scl + +i2c_1 + +sda + +scl i2c_1:sda->qwiic:sda1 - - - + + + i2c_1:scl->qwiic:scl1 - - - + + + i2c_1:sda->rph:g2_sda - - - + + + i2c_1:scl->rph:g3_scl - - - + + + i2c_1:sda->mb:5 - - - + + + i2c_1:scl->mb:6 - - - + + + i2c_1:sda->pmod1:4 - - - + + + i2c_1:scl->pmod1:3 - - - + + + spi_board - -spi_board - -copi - -cipo - -sclk - -cs_0 - -cs_1 + +spi_board + +copi + +cipo + +sclk + +cs_0 + +cs_1 appspi - -appspi_d0 - -copi - -flash - -appspi_d1 - -cipo - -appspi_d2 - -appspi_d3 - -appspi_clk - -sclk - -appspi_cs - -cs + +appspi_d0 + +copi + +flash + +appspi_d1 + +cipo + +appspi_d2 + +appspi_d3 + +appspi_clk + +sclk + +appspi_cs + +cs spi_board:copi->appspi:d0 - - + + spi_board:cipo->appspi:d1 - - + + spi_board:sclk->appspi:clk - - + + spi_board:cs_0->appspi:cs - - + + microsd - -microsd_cmd - -copi - -MicroSD card - -microsd_clk - -sclk - -microsd_dat0 - -cipo - -microsd_dat1 - -cipo - -microsd_dat2 - -cipo - -microsd_dat3 - -cs - -microsd_det - -gpi + +microsd_cmd + +copi + +MicroSD card + +microsd_clk + +sclk + +microsd_dat0 + +cipo + +microsd_dat1 + +cipo + +microsd_dat2 + +cipo + +microsd_dat3 + +cs + +microsd_det + +gpi spi_board:copi->microsd:cmd - - + + spi_board:cipo->microsd:dat0 - - + + spi_board:sclk->microsd:clk - - + + spi_board:cs_1->microsd:dat3 - - + + spi_lcd - -spi_lcd - -copi - -cipo - -sclk - -cs_0 - -cs_1 - -cs_2 + +spi_lcd + +copi + +cipo + +sclk + +cs_0 + +cs_1 + +cs_2 lcd - -lcd_copi - -copi - -lcd - -lcd_clk - -sclk - -lcd_cs - -cs - -lcd_dc - -gpo - -lcd_rst - -gpo - -lcd_backlight - -gpo + +lcd_copi + +copi + +lcd + +lcd_clk + +sclk + +lcd_cs + +cs + +lcd_dc + +gpo + +lcd_rst + +gpo + +lcd_backlight + +gpo spi_lcd:copi->lcd:copi - - + + spi_lcd:sclk->lcd:clk - - + + spi_lcd:cs_0->lcd:cs - - + + spi_lcd:cs_1->lcd:dc - - + + spi_lcd:cs_2->lcd:rst - - + + spi_ethmac - -spi_ethmac - -copi - -cipo - -sclk - -cs_0 - -cs_1 + +spi_ethmac + +copi + +cipo + +sclk + +cs_0 + +cs_1 ethmac - -ethmac_copi - -copi - -ethernet - -ethmac_cipo - -cipo - -ethmac_sclk - -sclk - -ethmac_cs - -cs - -ethmac_rst - -gpo + +ethmac_copi + +copi + +ethernet + +ethmac_cipo + +cipo + +ethmac_sclk + +sclk + +ethmac_cs + +cs + +ethmac_rst + +gpo spi_ethmac:copi->ethmac:copi - - + + spi_ethmac:cipo->ethmac:cipo - - + + spi_ethmac:sclk->ethmac:sclk - - + + spi_ethmac:cs_0->ethmac:cs - - + + spi_ethmac:cs_1->ethmac:rst - - + + spi_0 - -spi_0 - -copi - -cipo - -sclk - -cs_0 - -cs_1 - -cs_2 - -cs_3 + +spi_0 + +copi + +cipo + +sclk + +cs_0 + +cs_1 + +cs_2 + +cs_3 spi_0:copi->rph:g10_spi0_copi - - + + spi_0:cipo->rph:g9_spi0_cipo - - + + spi_0:sclk->rph:g11_spi0_sclk - - + + -spi_0:cs_0->rph:g7_spi0_ce0 - - +spi_0:cs_1->rph:g7_spi0_ce1 + + -spi_0:cs_1->rph:g8_spi0_ce1 - - +spi_0:cs_0->rph:g8_spi0_ce0 + + spi_0:copi->ah:tmpio11 - - + + spi_0:cipo->ah:tmpio12 - - + + spi_0:sclk->ah:tmpio13 - - + + spi_0:cs_3->ah:tmpio10 - - + + spi_0:copi->pmod0:2 - - + + spi_0:cipo->pmod0:3 - - + + spi_0:sclk->pmod0:4 - - + + spi_0:cs_0->pmod0:1 - - + + spi_0:cs_1->pmod0:7 - - + + spi_0:cs_2->pmod0:8 - - + + spi_1 - -spi_1 - -copi - -cipo - -sclk - -cs_0 - -cs_1 - -cs_2 - -cs_3 + +spi_1 + +copi + +cipo + +sclk + +cs_0 + +cs_1 + +cs_2 + +cs_3 spi_1:copi->rph:g20_spi1_copi - - + + spi_1:cipo->rph:g19_spi1_cipo - - + + spi_1:sclk->rph:g21_spi1_sclk - - + + spi_1:cs_0->rph:g18_spi1_ce0 - - + + spi_1:cs_1->rph:g17_spi1_ce1 - - + + spi_1:cs_2->rph:g16_spi1_ce2 - - + + spi_1:copi->mb:4 - - + + spi_1:cipo->mb:3 - - + + spi_1:sclk->mb:2 - - + + spi_1:cs_3->mb:1 - - + + spi_1:copi->pmod1:2 - - + + spi_1:cipo->pmod1:3 - - + + spi_1:sclk->pmod1:4 - - + + spi_1:cs_0->pmod1:1 - - + + spi_1:cs_1->pmod1:7 - - + + spi_1:cs_2->pmod1:8 - - + + gpio_board - -gpio_board - -gpo_0-7 - -gpi_0-7 - -gpi_8-12 - -gpi_13-15 - -gpi_16 + +gpio_board + +gpo_0-7 + +gpi_0-7 + +gpi_8-12 + +gpi_13-15 + +gpi_16 usr - -usrled0-7 - -gpo - -user leds, switches -and joystick - -usrsw0-7 - -gpi - -navsw0-4 - -gpi - -selsw0-2 - -gpi + +usrled0-7 + +gpo + +user leds, switches +and joystick + +usrsw0-7 + +gpi + +navsw0-4 + +gpi + +selsw0-2 + +gpi gpio_board:gpo_0-7->usr:led_0-7 - - + + gpio_board:gpi_0-7->usr:sw_0-7 - - + + gpio_board:gpi_8-12->usr:navsw_0-4 - - + + gpio_board:gpi_13-15->usr:selsw_0-2 - - + + gpio_board:gpi_16->microsd:det - - + + gpio_rph - -gpio_rph - -gpio_0-27 + +gpio_rph + +gpio_0-27 gpio_rph:gpio_0-27->rph:g0 - - - + + + gpio_rph:gpio_0-27->rph:g1 - - - + + + gpio_rph:gpio_0-27->rph:g2_sda - - - + + + gpio_rph:gpio_0-27->rph:g3_scl - - - + + + gpio_rph:gpio_0-27->rph:g4 - - - + + + gpio_rph:gpio_0-27->rph:g5 - - - + + + gpio_rph:gpio_0-27->rph:g6 - - - + + + -gpio_rph:gpio_0-27->rph:g7_spi0_ce0 - - - +gpio_rph:gpio_0-27->rph:g7_spi0_ce1 + + + -gpio_rph:gpio_0-27->rph:g8_spi0_ce1 - - - +gpio_rph:gpio_0-27->rph:g8_spi0_ce0 + + + gpio_rph:gpio_0-27->rph:g9_spi0_cipo - - - + + + gpio_rph:gpio_0-27->rph:g10_spi0_copi - - - + + + gpio_rph:gpio_0-27->rph:g11_spi0_sclk - - - + + + gpio_rph:gpio_0-27->rph:g12 - - - + + + gpio_rph:gpio_0-27->rph:g13 - - - + + + gpio_rph:gpio_0-27->rph:txd0 - - - + + + gpio_rph:gpio_0-27->rph:rxd0 - - - + + + gpio_rph:gpio_0-27->rph:g16_spi1_ce2 - - - + + + gpio_rph:gpio_0-27->rph:g17_spi1_ce1 - - - + + + gpio_rph:gpio_0-27->rph:g18_spi1_ce0 - - - + + + gpio_rph:gpio_0-27->rph:g19_spi1_cipo - - - + + + gpio_rph:gpio_0-27->rph:g20_spi1_copi - - - + + + gpio_rph:gpio_0-27->rph:g21_spi1_sclk - - - + + + gpio_rph:gpio_0-27->rph:g22 - - - + + + gpio_rph:gpio_0-27->rph:g23 - - - + + + gpio_rph:gpio_0-27->rph:g24 - - - + + + gpio_rph:gpio_0-27->rph:g25 - - - + + + gpio_rph:gpio_0-27->rph:g26 - - - + + + gpio_rph:gpio_0-27->rph:g27 - - - + + + gpio_ah - -gpio_ah - -gpio_0-13 + +gpio_ah + +gpio_0-13 gpio_ah:gpio_0-13->ah:tmpio0 - - - + + + gpio_ah:gpio_0-13->ah:tmpio1 - - - + + + gpio_ah:gpio_0-13->ah:tmpio2 - - - + + + gpio_ah:gpio_0-13->ah:tmpio3 - - - + + + gpio_ah:gpio_0-13->ah:tmpio4 - - - + + + gpio_ah:gpio_0-13->ah:tmpio5 - - - + + + gpio_ah:gpio_0-13->ah:tmpio6 - - - + + + gpio_ah:gpio_0-13->ah:tmpio7 - - - + + + gpio_ah:gpio_0-13->ah:tmpio8 - - - + + + gpio_ah:gpio_0-13->ah:tmpio9 - - - + + + gpio_ah:gpio_0-13->ah:tmpio10 - - - + + + gpio_ah:gpio_0-13->ah:tmpio11 - - - + + + gpio_ah:gpio_0-13->ah:tmpio12 - - - + + + gpio_ah:gpio_0-13->ah:tmpio13 - - - + + + gpio_pmod0 - -gpio_pmod0 - -gpio_0-7 + +gpio_pmod0 + +gpio_0-7 gpio_pmod0:gpio_0-7->pmod0:1 - - - + + + gpio_pmod0:gpio_0-7->pmod0:2 - - - + + + gpio_pmod0:gpio_0-7->pmod0:3 - - - + + + gpio_pmod0:gpio_0-7->pmod0:4 - - - + + + gpio_pmod0:gpio_0-7->pmod0:5 - - - + + + gpio_pmod0:gpio_0-7->pmod0:6 - - - + + + gpio_pmod0:gpio_0-7->pmod0:7 - - - + + + gpio_pmod0:gpio_0-7->pmod0:8 - - - + + + gpio_pmodc - -gpio_pmodc - -gpio_0-5 + +gpio_pmodc + +gpio_0-5 pmodc - -pmodc_1 - -gpio - -Pmod C - -pmodc_2 - -gpio - -pmodc_3 - -gpio - -pmodc_4 - -gpio - -pmodc_5 - -gpio - -pmodc_6 - -gpio + +pmodc_1 + +gpio + +Pmod C + +pmodc_2 + +gpio + +pmodc_3 + +gpio + +pmodc_4 + +gpio + +pmodc_5 + +gpio + +pmodc_6 + +gpio gpio_pmodc:gpio_0-5->pmodc:1 - - - + + + gpio_pmodc:gpio_0-5->pmodc:2 - - - + + + gpio_pmodc:gpio_0-5->pmodc:3 - - - + + + gpio_pmodc:gpio_0-5->pmodc:4 - - - + + + gpio_pmodc:gpio_0-5->pmodc:5 - - - + + + gpio_pmodc:gpio_0-5->pmodc:6 - - - + + + gpio_pmod1 - -gpio_pmod1 - -gpio_0-7 + +gpio_pmod1 + +gpio_0-7 gpio_pmod1:gpio_0-7->pmod1:1 - - - + + + gpio_pmod1:gpio_0-7->pmod1:2 - - - + + + gpio_pmod1:gpio_0-7->pmod1:3 - - - + + + gpio_pmod1:gpio_0-7->pmod1:4 - - - + + + gpio_pmod1:gpio_0-7->pmod1:5 - - - + + + gpio_pmod1:gpio_0-7->pmod1:6 - - - + + + gpio_pmod1:gpio_0-7->pmod1:7 - - - + + + gpio_pmod1:gpio_0-7->pmod1:8 - - - + + + pwm - -pwm - -0 - -1 - -2 - -3 - -4 - -5 - -6 + +pwm + +0 + +1 + +2 + +3 + +4 + +5 + +6 pwm:6->lcd:backlight - - + + pwm:0->rph:g12 - - + + pwm:1->rph:g13 - - + + pwm:2->rph:g18_spi1_ce0 - - + + pwm:3->rph:g19_spi1_cipo - - + + pwm:4->rph:g20_spi1_copi - - + + pwm:5->rph:g21_spi1_sclk - - + + pwm:0->ah:tmpio3 - - + + pwm:1->ah:tmpio5 - - + + pwm:2->ah:tmpio6 - - + + pwm:3->ah:tmpio9 - - + + pwm:4->ah:tmpio10 - - + + pwm:5->ah:tmpio11 - - + + pwm:0->mb:10 - - + + pwm:1->pmod0:2 - - + + pwm:2->pmod0:6 - - + + pwm:3->pmod1:2 - - + + pwm:4->pmod1:6 - - + + From e77b3590da414d3b27aeb868af526d1a2d7b735c Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Fri, 8 Nov 2024 11:33:46 +0000 Subject: [PATCH 2/5] Update SPI names/numbering in pin mapping diagram In the latest RTL changes, `spi_board` was changed to go back through Pinmux, and hence it became `spi0` again (this is the SPI for flash and MicroSD). Hence SPI0 now becomes SPI1 and SPI1 becomes SPI2. This is already up-to-date and working in `top_config.toml`, but until this commit it had not yet been updated to reflect that in the pin mapping diagram. --- doc/ip/pinmux/pin_mappings.dot | 94 +++++++-------- doc/ip/pinmux/pin_mappings.svg | 208 ++++++++++++++++----------------- 2 files changed, 151 insertions(+), 151 deletions(-) diff --git a/doc/ip/pinmux/pin_mappings.dot b/doc/ip/pinmux/pin_mappings.dot index d29eca637..560490535 100644 --- a/doc/ip/pinmux/pin_mappings.dot +++ b/doc/ip/pinmux/pin_mappings.dot @@ -14,7 +14,7 @@ digraph { i2c_1 [label = "i2c_1|sda|scl"] // SPI for Flash & microSD - spi_board [label = "spi_board\ + spi_0 [label = "spi_0\ |copi\ |cipo\ |sclk\ @@ -42,7 +42,7 @@ digraph { "] // Pi Spi0, Pmod 0, Arduino Header - spi_0 [label = "spi_0\ + spi_1 [label = "spi_1\ |copi\ |cipo\ |sclk\ @@ -53,7 +53,7 @@ digraph { "] // Pi Spi1, Pmod 1, mikroBUS - spi_1 [label = "spi_1\ + spi_2 [label = "spi_2\ |copi\ |cipo\ |sclk\ @@ -383,15 +383,15 @@ digraph { // SPI edge [dir=forward color=dodgerblue]; - spi_board:copi -> appspi:d0; - spi_board:cipo -> appspi:d1 [dir=back]; - spi_board:sclk -> appspi:clk; - spi_board:cs_0 -> appspi:cs; + spi_0:copi -> appspi:d0; + spi_0:cipo -> appspi:d1 [dir=back]; + spi_0:sclk -> appspi:clk; + spi_0:cs_0 -> appspi:cs; - spi_board:copi -> microsd:cmd; - spi_board:cipo -> microsd:dat0 [dir=back]; - spi_board:sclk -> microsd:clk; - spi_board:cs_1 -> microsd:dat3; + spi_0:copi -> microsd:cmd; + spi_0:cipo -> microsd:dat0 [dir=back]; + spi_0:sclk -> microsd:clk; + spi_0:cs_1 -> microsd:dat3; spi_lcd:copi -> lcd:copi; spi_lcd:sclk -> lcd:clk; @@ -405,42 +405,42 @@ digraph { spi_ethmac:cs_0 -> ethmac:cs; spi_ethmac:cs_1 -> ethmac:rst; - spi_0:copi -> pmod0:2; - spi_0:cipo -> pmod0:3 [dir=back]; - spi_0:sclk -> pmod0:4; - spi_0:cs_0 -> pmod0:1; - spi_0:cs_1 -> pmod0:7; - spi_0:cs_2 -> pmod0:8; - - spi_0:copi -> rph:g10_spi0_copi; - spi_0:cipo -> rph:g9_spi0_cipo [dir=back]; - spi_0:sclk -> rph:g11_spi0_sclk; - spi_0:cs_1 -> rph:g7_spi0_ce1; - spi_0:cs_0 -> rph:g8_spi0_ce0; - - spi_0:copi -> ah:tmpio11; - spi_0:cipo -> ah:tmpio12 [dir=back]; - spi_0:sclk -> ah:tmpio13; - spi_0:cs_3 -> ah:tmpio10; - - spi_1:copi -> pmod1:2; - spi_1:cipo -> pmod1:3 [dir=back]; - spi_1:sclk -> pmod1:4; - spi_1:cs_0 -> pmod1:1; - spi_1:cs_1 -> pmod1:7; - spi_1:cs_2 -> pmod1:8; - - spi_1:copi -> rph:g20_spi1_copi; - spi_1:cipo -> rph:g19_spi1_cipo [dir=back]; - spi_1:sclk -> rph:g21_spi1_sclk; - spi_1:cs_0 -> rph:g18_spi1_ce0; - spi_1:cs_1 -> rph:g17_spi1_ce1; - spi_1:cs_2 -> rph:g16_spi1_ce2; - - spi_1:copi -> mb:4; - spi_1:cipo -> mb:3 [dir=back]; - spi_1:sclk -> mb:2; - spi_1:cs_3 -> mb:1; + spi_1:copi -> pmod0:2; + spi_1:cipo -> pmod0:3 [dir=back]; + spi_1:sclk -> pmod0:4; + spi_1:cs_0 -> pmod0:1; + spi_1:cs_1 -> pmod0:7; + spi_1:cs_2 -> pmod0:8; + + spi_1:copi -> rph:g10_spi0_copi; + spi_1:cipo -> rph:g9_spi0_cipo [dir=back]; + spi_1:sclk -> rph:g11_spi0_sclk; + spi_1:cs_1 -> rph:g7_spi0_ce1; + spi_1:cs_0 -> rph:g8_spi0_ce0; + + spi_1:copi -> ah:tmpio11; + spi_1:cipo -> ah:tmpio12 [dir=back]; + spi_1:sclk -> ah:tmpio13; + spi_1:cs_3 -> ah:tmpio10; + + spi_2:copi -> pmod1:2; + spi_2:cipo -> pmod1:3 [dir=back]; + spi_2:sclk -> pmod1:4; + spi_2:cs_0 -> pmod1:1; + spi_2:cs_1 -> pmod1:7; + spi_2:cs_2 -> pmod1:8; + + spi_2:copi -> rph:g20_spi1_copi; + spi_2:cipo -> rph:g19_spi1_cipo [dir=back]; + spi_2:sclk -> rph:g21_spi1_sclk; + spi_2:cs_0 -> rph:g18_spi1_ce0; + spi_2:cs_1 -> rph:g17_spi1_ce1; + spi_2:cs_2 -> rph:g16_spi1_ce2; + + spi_2:copi -> mb:4; + spi_2:cipo -> mb:3 [dir=back]; + spi_2:sclk -> mb:2; + spi_2:cs_3 -> mb:1; // PWM edge [dir=forward color=hotpink]; diff --git a/doc/ip/pinmux/pin_mappings.svg b/doc/ip/pinmux/pin_mappings.svg index e0040a955..51f277afb 100644 --- a/doc/ip/pinmux/pin_mappings.svg +++ b/doc/ip/pinmux/pin_mappings.svg @@ -628,20 +628,20 @@ - + -spi_board - -spi_board - +spi_0 + +spi_0 + copi - + cipo - + sclk - + cs_0 - + cs_1 @@ -670,28 +670,28 @@ cs - + -spi_board:copi->appspi:d0 - - +spi_0:copi->appspi:d0 + + - + -spi_board:cipo->appspi:d1 - - +spi_0:cipo->appspi:d1 + + - + -spi_board:sclk->appspi:clk - +spi_0:sclk->appspi:clk + - + -spi_board:cs_0->appspi:cs - +spi_0:cs_0->appspi:cs + @@ -728,28 +728,28 @@ gpi - + -spi_board:copi->microsd:cmd - +spi_0:copi->microsd:cmd + - + -spi_board:cipo->microsd:dat0 - - +spi_0:cipo->microsd:dat0 + + - + -spi_board:sclk->microsd:clk - +spi_0:sclk->microsd:clk + - + -spi_board:cs_1->microsd:dat3 - +spi_0:cs_1->microsd:dat3 + @@ -902,11 +902,11 @@ - + -spi_0 +spi_1 -spi_0 +spi_1 copi @@ -922,101 +922,101 @@ cs_3 - + -spi_0:copi->rph:g10_spi0_copi +spi_1:copi->rph:g10_spi0_copi - + -spi_0:cipo->rph:g9_spi0_cipo +spi_1:cipo->rph:g9_spi0_cipo - + -spi_0:sclk->rph:g11_spi0_sclk +spi_1:sclk->rph:g11_spi0_sclk - + -spi_0:cs_1->rph:g7_spi0_ce1 +spi_1:cs_1->rph:g7_spi0_ce1 - + -spi_0:cs_0->rph:g8_spi0_ce0 +spi_1:cs_0->rph:g8_spi0_ce0 - + -spi_0:copi->ah:tmpio11 +spi_1:copi->ah:tmpio11 - + -spi_0:cipo->ah:tmpio12 +spi_1:cipo->ah:tmpio12 - + -spi_0:sclk->ah:tmpio13 +spi_1:sclk->ah:tmpio13 - + -spi_0:cs_3->ah:tmpio10 +spi_1:cs_3->ah:tmpio10 - + -spi_0:copi->pmod0:2 +spi_1:copi->pmod0:2 - + -spi_0:cipo->pmod0:3 +spi_1:cipo->pmod0:3 - + -spi_0:sclk->pmod0:4 +spi_1:sclk->pmod0:4 - + -spi_0:cs_0->pmod0:1 +spi_1:cs_0->pmod0:1 - + -spi_0:cs_1->pmod0:7 +spi_1:cs_1->pmod0:7 - + -spi_0:cs_2->pmod0:8 +spi_1:cs_2->pmod0:8 - + -spi_1 +spi_2 -spi_1 +spi_2 copi @@ -1032,99 +1032,99 @@ cs_3 - + -spi_1:copi->rph:g20_spi1_copi +spi_2:copi->rph:g20_spi1_copi - + -spi_1:cipo->rph:g19_spi1_cipo +spi_2:cipo->rph:g19_spi1_cipo - + -spi_1:sclk->rph:g21_spi1_sclk +spi_2:sclk->rph:g21_spi1_sclk - + -spi_1:cs_0->rph:g18_spi1_ce0 +spi_2:cs_0->rph:g18_spi1_ce0 - + -spi_1:cs_1->rph:g17_spi1_ce1 +spi_2:cs_1->rph:g17_spi1_ce1 - + -spi_1:cs_2->rph:g16_spi1_ce2 +spi_2:cs_2->rph:g16_spi1_ce2 - + -spi_1:copi->mb:4 +spi_2:copi->mb:4 - + -spi_1:cipo->mb:3 +spi_2:cipo->mb:3 - + -spi_1:sclk->mb:2 +spi_2:sclk->mb:2 - + -spi_1:cs_3->mb:1 +spi_2:cs_3->mb:1 - + -spi_1:copi->pmod1:2 +spi_2:copi->pmod1:2 - + -spi_1:cipo->pmod1:3 +spi_2:cipo->pmod1:3 - + -spi_1:sclk->pmod1:4 +spi_2:sclk->pmod1:4 - + -spi_1:cs_0->pmod1:1 +spi_2:cs_0->pmod1:1 - + -spi_1:cs_1->pmod1:7 +spi_2:cs_1->pmod1:7 - + -spi_1:cs_2->pmod1:8 +spi_2:cs_2->pmod1:8 From 03a03c6cc6e1a109f4da8ed919a7af82ab3e7cd5 Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Fri, 8 Nov 2024 11:40:56 +0000 Subject: [PATCH 3/5] Change PMOD0&1 Pin names in mapping diagram to match top config `top_config.toml` was already updated to change the names of `PMOD{0,1}_{5,6,7,8}` to `PMOD{0,1}_{7,8,9,10}`. This commit updates the pin mapping diagram to match the names of these pins accordingly. This change was originally made so that pin names better reflect the numbers/names given to pins by the Digilent specification, and not the pin names on the schematic. Also fixes a minor typo for `pmod1_4`, which said "sca" rather than "sda" for the I2C1 Serial Data pin. --- doc/ip/pinmux/pin_mappings.dot | 38 ++-- doc/ip/pinmux/pin_mappings.svg | 328 ++++++++++++++++----------------- 2 files changed, 183 insertions(+), 183 deletions(-) diff --git a/doc/ip/pinmux/pin_mappings.dot b/doc/ip/pinmux/pin_mappings.dot index 560490535..4e1b947bd 100644 --- a/doc/ip/pinmux/pin_mappings.dot +++ b/doc/ip/pinmux/pin_mappings.dot @@ -290,10 +290,10 @@ digraph {
pmod0_2gpio, copi, pwm, tx
pmod0_3gpio, cipo, scl, rx
pmod0_4gpio, sclk, sda
-
pmod0_5gpio
-
pmod0_6gpio, pwm
-
pmod0_7gpio, cs
-
pmod0_8gpio, cs
+
pmod0_7gpio
+
pmod0_8gpio, pwm
+
pmod0_9gpio, cs
+
pmod0_10gpio, cs
>]; @@ -305,11 +305,11 @@ digraph {
pmod1_2gpio, copi, pwm, tx
pmod1_3gpio, cipo, scl, rx
-
pmod1_4gpio, sclk, sca
-
pmod1_5gpio
-
pmod1_6gpio, pwm
-
pmod1_7gpio, cs
-
pmod1_8gpio, cs
+
pmod1_4gpio, sclk, sda
+
pmod1_7gpio
+
pmod1_8gpio, pwm
+
pmod1_9gpio, cs
+
pmod1_10gpio, cs
>]; @@ -409,8 +409,8 @@ digraph { spi_1:cipo -> pmod0:3 [dir=back]; spi_1:sclk -> pmod0:4; spi_1:cs_0 -> pmod0:1; - spi_1:cs_1 -> pmod0:7; - spi_1:cs_2 -> pmod0:8; + spi_1:cs_1 -> pmod0:9; + spi_1:cs_2 -> pmod0:10; spi_1:copi -> rph:g10_spi0_copi; spi_1:cipo -> rph:g9_spi0_cipo [dir=back]; @@ -427,8 +427,8 @@ digraph { spi_2:cipo -> pmod1:3 [dir=back]; spi_2:sclk -> pmod1:4; spi_2:cs_0 -> pmod1:1; - spi_2:cs_1 -> pmod1:7; - spi_2:cs_2 -> pmod1:8; + spi_2:cs_1 -> pmod1:9; + spi_2:cs_2 -> pmod1:10; spi_2:copi -> rph:g20_spi1_copi; spi_2:cipo -> rph:g19_spi1_cipo [dir=back]; @@ -447,9 +447,9 @@ digraph { pwm:0 -> mb:10; pwm:1 -> pmod0:2; - pwm:2 -> pmod0:6; + pwm:2 -> pmod0:8; pwm:3 -> pmod1:2; - pwm:4 -> pmod1:6; + pwm:4 -> pmod1:8; pwm:6 -> lcd:backlight; @@ -526,19 +526,19 @@ digraph { gpio_pmod0:"gpio_0-7" -> pmod0:2; gpio_pmod0:"gpio_0-7" -> pmod0:3; gpio_pmod0:"gpio_0-7" -> pmod0:4; - gpio_pmod0:"gpio_0-7" -> pmod0:5; - gpio_pmod0:"gpio_0-7" -> pmod0:6; gpio_pmod0:"gpio_0-7" -> pmod0:7; gpio_pmod0:"gpio_0-7" -> pmod0:8; + gpio_pmod0:"gpio_0-7" -> pmod0:9; + gpio_pmod0:"gpio_0-7" -> pmod0:10; gpio_pmod1:"gpio_0-7" -> pmod1:1; gpio_pmod1:"gpio_0-7" -> pmod1:2; gpio_pmod1:"gpio_0-7" -> pmod1:3; gpio_pmod1:"gpio_0-7" -> pmod1:4; - gpio_pmod1:"gpio_0-7" -> pmod1:5; - gpio_pmod1:"gpio_0-7" -> pmod1:6; gpio_pmod1:"gpio_0-7" -> pmod1:7; gpio_pmod1:"gpio_0-7" -> pmod1:8; + gpio_pmod1:"gpio_0-7" -> pmod1:9; + gpio_pmod1:"gpio_0-7" -> pmod1:10; gpio_pmodc:"gpio_0-5" -> pmodc:1; gpio_pmodc:"gpio_0-5" -> pmodc:2; diff --git a/doc/ip/pinmux/pin_mappings.svg b/doc/ip/pinmux/pin_mappings.svg index 51f277afb..5ba0959aa 100644 --- a/doc/ip/pinmux/pin_mappings.svg +++ b/doc/ip/pinmux/pin_mappings.svg @@ -341,52 +341,52 @@ pmod0 - -pmod0_1 - -gpio, cs - -Pmod 0 -types 1A, 2A, 3A or 6A - -pmod0_2 - -gpio, copi, pwm, tx - -pmod0_3 - -gpio, cipo, scl, rx - -pmod0_4 - -gpio, sclk, sda - -pmod0_5 - -gpio - -pmod0_6 - -gpio, pwm - -pmod0_7 - -gpio, cs - -pmod0_8 - -gpio, cs + +pmod0_1 + +gpio, cs + +Pmod 0 +types 1A, 2A, 3A or 6A + +pmod0_2 + +gpio, copi, pwm, tx + +pmod0_3 + +gpio, cipo, scl, rx + +pmod0_4 + +gpio, sclk, sda + +pmod0_7 + +gpio + +pmod0_8 + +gpio, pwm + +pmod0_9 + +gpio, cs + +pmod0_10 + +gpio, cs uart_1:tx->pmod0:2 - - + + uart_1:rx->pmod0:3 - + @@ -440,52 +440,52 @@ pmod1 - -pmod1_1 - -gpio, cs - -Pmod 1 -types 1A, 2A, 3A or 6A - -pmod1_2 - -gpio, copi, pwm, tx - -pmod1_3 - -gpio, cipo, scl, rx - -pmod1_4 - -gpio, sclk, sca - -pmod1_5 - -gpio - -pmod1_6 - -gpio, pwm - -pmod1_7 - -gpio, cs - -pmod1_8 - -gpio, cs + +pmod1_1 + +gpio, cs + +Pmod 1 +types 1A, 2A, 3A or 6A + +pmod1_2 + +gpio, copi, pwm, tx + +pmod1_3 + +gpio, cipo, scl, rx + +pmod1_4 + +gpio, sclk, sda + +pmod1_7 + +gpio + +pmod1_8 + +gpio, pwm + +pmod1_9 + +gpio, cs + +pmod1_10 + +gpio, cs uart_2:tx->pmod1:2 - - + + uart_2:rx->pmod1:3 - + @@ -551,16 +551,16 @@ i2c_0:sda->pmod0:4 - + - + i2c_0:scl->pmod0:3 - + - + @@ -617,16 +617,16 @@ i2c_1:sda->pmod1:4 - + - + i2c_1:scl->pmod1:3 - + - + @@ -979,38 +979,38 @@ spi_1:copi->pmod0:2 - - + + spi_1:cipo->pmod0:3 - + spi_1:sclk->pmod0:4 - - + + spi_1:cs_0->pmod0:1 - - + + -spi_1:cs_1->pmod0:7 - - +spi_1:cs_1->pmod0:9 + + -spi_1:cs_2->pmod0:8 - - +spi_1:cs_2->pmod0:10 + + @@ -1095,38 +1095,38 @@ spi_2:copi->pmod1:2 - - + + spi_2:cipo->pmod1:3 - + spi_2:sclk->pmod1:4 - - + + spi_2:cs_0->pmod1:1 - - + + -spi_2:cs_1->pmod1:7 - - +spi_2:cs_1->pmod1:9 + + -spi_2:cs_2->pmod1:8 - - +spi_2:cs_2->pmod1:10 + + @@ -1518,58 +1518,58 @@ gpio_pmod0:gpio_0-7->pmod0:1 - - - + + + gpio_pmod0:gpio_0-7->pmod0:2 - - - + + + gpio_pmod0:gpio_0-7->pmod0:3 - + - + gpio_pmod0:gpio_0-7->pmod0:4 - + - + -gpio_pmod0:gpio_0-7->pmod0:5 - +gpio_pmod0:gpio_0-7->pmod0:7 + - + -gpio_pmod0:gpio_0-7->pmod0:6 - +gpio_pmod0:gpio_0-7->pmod0:8 + - + -gpio_pmod0:gpio_0-7->pmod0:7 - - - +gpio_pmod0:gpio_0-7->pmod0:9 + + + -gpio_pmod0:gpio_0-7->pmod0:8 - +gpio_pmod0:gpio_0-7->pmod0:10 + - + @@ -1662,58 +1662,58 @@ gpio_pmod1:gpio_0-7->pmod1:1 - + - + gpio_pmod1:gpio_0-7->pmod1:2 - + - + gpio_pmod1:gpio_0-7->pmod1:3 - + - + gpio_pmod1:gpio_0-7->pmod1:4 - + - + -gpio_pmod1:gpio_0-7->pmod1:5 - +gpio_pmod1:gpio_0-7->pmod1:7 + - + -gpio_pmod1:gpio_0-7->pmod1:6 - - - +gpio_pmod1:gpio_0-7->pmod1:8 + + + -gpio_pmod1:gpio_0-7->pmod1:7 - +gpio_pmod1:gpio_0-7->pmod1:9 + - + -gpio_pmod1:gpio_0-7->pmod1:8 - +gpio_pmod1:gpio_0-7->pmod1:10 + - + @@ -1822,26 +1822,26 @@ pwm:1->pmod0:2 - - + + -pwm:2->pmod0:6 - - +pwm:2->pmod0:8 + + pwm:3->pmod1:2 - - + + -pwm:4->pmod1:6 - - +pwm:4->pmod1:8 + + From 6df2306bc5ccd2391dfdf60953da7837847c76e0 Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Fri, 8 Nov 2024 11:50:10 +0000 Subject: [PATCH 4/5] Add RS485 RX and TX pins to the pin mapping diagram Update the pin mapping diagram to match `top_config.toml` by adding the RS485 TX and RX pins to the pin mapping diagram, which are mapped to UART2's TX and RX respectively. --- doc/ip/pinmux/pin_mappings.dot | 13 +- doc/ip/pinmux/pin_mappings.svg | 1784 ++++++++++++++++---------------- 2 files changed, 917 insertions(+), 880 deletions(-) diff --git a/doc/ip/pinmux/pin_mappings.dot b/doc/ip/pinmux/pin_mappings.dot index 4e1b947bd..0bb8b9177 100644 --- a/doc/ip/pinmux/pin_mappings.dot +++ b/doc/ip/pinmux/pin_mappings.dot @@ -108,7 +108,15 @@ digraph { >]; - // missing rx485_{ro,de,ren,di} + rs485 [label=< + + + + + + +
rs485_txtxrs485
rs485_rxrx
+ >]; rs232 [label=< @@ -354,6 +362,9 @@ digraph { uart_2:tx -> rs232:tx; uart_2:rx -> rs232:rx [dir=back]; + uart_2:tx -> rs485:tx; + uart_2:rx -> rs485:rx [dir=back]; + uart_2:tx -> pmod1:2; uart_2:rx -> pmod1:3 [dir=back]; diff --git a/doc/ip/pinmux/pin_mappings.svg b/doc/ip/pinmux/pin_mappings.svg index 5ba0959aa..00a1104e4 100644 --- a/doc/ip/pinmux/pin_mappings.svg +++ b/doc/ip/pinmux/pin_mappings.svg @@ -4,20 +4,20 @@ - - + + %3 - + uart_0 - -uart_0 - -tx - -rx + +uart_0 + +tx + +rx @@ -44,169 +44,169 @@ uart_0:tx->usb:ser0_tx - - + + uart_0:rx->usb:ser0_rx - - + + uart_1 - -uart_1 - -tx - -rx + +uart_1 + +tx + +rx uart_1:tx->usb:ser1_tx - + uart_1:rx->usb:ser1_rx - - + + - + rph - -rph_g0 - -gpio, sda - -Raspberry Pi HAT - -rph_g1 - -gpio, scl - -rph_g2_sda - -gpio, sda - -rph_g3_scl - -gpio, scl - -rph_g4 - -gpio - -rph_g5 - -gpio - -rph_g6 - -gpio - -rph_g7_spi0_ce1 - -gpio, cs - -rph_g8_spi0_ce0 - -gpio, cs - -rph_g9_spi0_cipo - -gpio, cipo - -rph_g10_spi0_copi - -gpio, copi - -rph_g11_spi0_sclk - -gpio, sclk - -rph_g12 - -gpio, pwm - -rph_g13 - -gpio, pwm - -rph_txd0 - -gpio, tx - -rph_rxd0 - -gpio, rx - -rph_g16_spi1_ce2 - -gpio, cs - -rph_g17_spi1_ce1 - -gpio, cs - -rph_g18_spi1_ce0 - -gpio, cs, pwm - -rph_g19_spi1_cipo - -gpio, cipo, pwm - -rph_g20_spi1_copi - -gpio, copi, pwm - -rph_g21_spi1_sclk - -gpio, sclk, pwm - -rph_g22 - -gpio - -rph_g23 - -gpio - -rph_g24 - -gpio - -rph_g25 - -gpio - -rph_g26 - -gpio - -rph_g27 - -gpio + +rph_g0 + +gpio, sda + +Raspberry Pi HAT + +rph_g1 + +gpio, scl + +rph_g2_sda + +gpio, sda + +rph_g3_scl + +gpio, scl + +rph_g4 + +gpio + +rph_g5 + +gpio + +rph_g6 + +gpio + +rph_g7_spi0_ce1 + +gpio, cs + +rph_g8_spi0_ce0 + +gpio, cs + +rph_g9_spi0_cipo + +gpio, cipo + +rph_g10_spi0_copi + +gpio, copi + +rph_g11_spi0_sclk + +gpio, sclk + +rph_g12 + +gpio, pwm + +rph_g13 + +gpio, pwm + +rph_txd0 + +gpio, tx + +rph_rxd0 + +gpio, rx + +rph_g16_spi1_ce2 + +gpio, cs + +rph_g17_spi1_ce1 + +gpio, cs + +rph_g18_spi1_ce0 + +gpio, cs, pwm + +rph_g19_spi1_cipo + +gpio, cipo, pwm + +rph_g20_spi1_copi + +gpio, copi, pwm + +rph_g21_spi1_sclk + +gpio, sclk, pwm + +rph_g22 + +gpio + +rph_g23 + +gpio + +rph_g24 + +gpio + +rph_g25 + +gpio + +rph_g26 + +gpio + +rph_g27 + +gpio uart_1:tx->rph:txd0 - - + + uart_1:rx->rph:rxd0 - - + + - + ah ah_tmpio0 @@ -270,17 +270,17 @@ uart_1:tx->ah:tmpio1 - + uart_1:rx->ah:tmpio0 - - + + - + mb mb0 @@ -329,17 +329,17 @@ uart_1:tx->mb:7 - + uart_1:rx->mb:8 - - + + - + pmod0 pmod0_1 @@ -380,65 +380,91 @@ uart_1:tx->pmod0:2 - - + + uart_1:rx->pmod0:3 - - + + uart_2 - -uart_2 - -tx - -rx + +uart_2 + +tx + +rx uart_2:tx->usb:ser1_tx - - + + uart_2:rx->usb:ser1_rx - - + + - + -rs232 +rs485 -rs232_tx +rs485_tx tx -rs232 +rs485 -rs232_rx +rs485_rx rx + + +uart_2:tx->rs485:tx + + + + + +uart_2:rx->rs485:rx + + + + + +rs232 + +rs232_tx + +tx + +rs232 + +rs232_rx + +rx + uart_2:tx->rs232:tx - - + + uart_2:rx->rs232:rx - - + + - + pmod1 pmod1_1 @@ -477,29 +503,29 @@ gpio, cs - + uart_2:tx->pmod1:2 - - + + - + uart_2:rx->pmod1:3 - - + + i2c_0 - -i2c_0 - -sda - -scl + +i2c_0 + +sda + +scl - + qwiic sda0 @@ -521,257 +547,257 @@ scl - + i2c_0:sda->qwiic:sda0 - - + + - + i2c_0:scl->qwiic:scl0 - - + + - + i2c_0:sda->rph:g0 - - - + + + - + i2c_0:scl->rph:g1 - - - + + + - + i2c_0:sda->pmod0:4 - - + + - + i2c_0:scl->pmod0:3 - - + + i2c_1 - -i2c_1 - -sda - -scl + +i2c_1 + +sda + +scl - + i2c_1:sda->qwiic:sda1 - - + + - + i2c_1:scl->qwiic:scl1 - - + + - + i2c_1:sda->rph:g2_sda - - - + + + - + i2c_1:scl->rph:g3_scl - - - + + + - + i2c_1:sda->mb:5 - - - + + + - + i2c_1:scl->mb:6 - - - + + + - + i2c_1:sda->pmod1:4 - - + + - + i2c_1:scl->pmod1:3 - - - + + + spi_0 - -spi_0 - -copi - -cipo - -sclk - -cs_0 - -cs_1 + +spi_0 + +copi + +cipo + +sclk + +cs_0 + +cs_1 - + appspi - -appspi_d0 - -copi - -flash - -appspi_d1 - -cipo - -appspi_d2 - -appspi_d3 - -appspi_clk - -sclk - -appspi_cs - -cs + +appspi_d0 + +copi + +flash + +appspi_d1 + +cipo + +appspi_d2 + +appspi_d3 + +appspi_clk + +sclk + +appspi_cs + +cs - + spi_0:copi->appspi:d0 - - + + - + spi_0:cipo->appspi:d1 - - + + - + spi_0:sclk->appspi:clk - - + + - + spi_0:cs_0->appspi:cs - - + + - + microsd - -microsd_cmd - -copi - -MicroSD card - -microsd_clk - -sclk - -microsd_dat0 - -cipo - -microsd_dat1 - -cipo - -microsd_dat2 - -cipo - -microsd_dat3 - -cs - -microsd_det - -gpi + +microsd_cmd + +copi + +MicroSD card + +microsd_clk + +sclk + +microsd_dat0 + +cipo + +microsd_dat1 + +cipo + +microsd_dat2 + +cipo + +microsd_dat3 + +cs + +microsd_det + +gpi - + spi_0:copi->microsd:cmd - - + + - + spi_0:cipo->microsd:dat0 - - + + - + spi_0:sclk->microsd:clk - - + + - + spi_0:cs_1->microsd:dat3 - - + + spi_lcd - -spi_lcd - -copi - -cipo - -sclk - -cs_0 - -cs_1 - -cs_2 + +spi_lcd + +copi + +cipo + +sclk + +cs_0 + +cs_1 + +cs_2 - + lcd lcd_copi @@ -801,605 +827,605 @@ gpo - + spi_lcd:copi->lcd:copi - + - + spi_lcd:sclk->lcd:clk - + - + spi_lcd:cs_0->lcd:cs - - + + - + spi_lcd:cs_1->lcd:dc - - + + - + spi_lcd:cs_2->lcd:rst - - + + spi_ethmac - -spi_ethmac - -copi - -cipo - -sclk - -cs_0 - -cs_1 + +spi_ethmac + +copi + +cipo + +sclk + +cs_0 + +cs_1 - + ethmac - -ethmac_copi - -copi - -ethernet - -ethmac_cipo - -cipo - -ethmac_sclk - -sclk - -ethmac_cs - -cs - -ethmac_rst - -gpo + +ethmac_copi + +copi + +ethernet + +ethmac_cipo + +cipo + +ethmac_sclk + +sclk + +ethmac_cs + +cs + +ethmac_rst + +gpo - + spi_ethmac:copi->ethmac:copi - - + + - + spi_ethmac:cipo->ethmac:cipo - - + + - + spi_ethmac:sclk->ethmac:sclk - - + + - + spi_ethmac:cs_0->ethmac:cs - - + + - + spi_ethmac:cs_1->ethmac:rst - - + + spi_1 - -spi_1 - -copi - -cipo - -sclk - -cs_0 - -cs_1 - -cs_2 - -cs_3 + +spi_1 + +copi + +cipo + +sclk + +cs_0 + +cs_1 + +cs_2 + +cs_3 - + spi_1:copi->rph:g10_spi0_copi - - + + - + spi_1:cipo->rph:g9_spi0_cipo - - + + - + spi_1:sclk->rph:g11_spi0_sclk - - + + - + spi_1:cs_1->rph:g7_spi0_ce1 - - + + - + spi_1:cs_0->rph:g8_spi0_ce0 - - + + - + spi_1:copi->ah:tmpio11 - + - + spi_1:cipo->ah:tmpio12 - - + + - + spi_1:sclk->ah:tmpio13 - + - + spi_1:cs_3->ah:tmpio10 - + - + spi_1:copi->pmod0:2 - + - + spi_1:cipo->pmod0:3 - - + + - + spi_1:sclk->pmod0:4 - + - + spi_1:cs_0->pmod0:1 - - + + - + spi_1:cs_1->pmod0:9 - + - + spi_1:cs_2->pmod0:10 - + spi_2 - -spi_2 - -copi - -cipo - -sclk - -cs_0 - -cs_1 - -cs_2 - -cs_3 + +spi_2 + +copi + +cipo + +sclk + +cs_0 + +cs_1 + +cs_2 + +cs_3 - + spi_2:copi->rph:g20_spi1_copi - - + + - + spi_2:cipo->rph:g19_spi1_cipo - - + + - + spi_2:sclk->rph:g21_spi1_sclk - - + + - + spi_2:cs_0->rph:g18_spi1_ce0 - - + + - + spi_2:cs_1->rph:g17_spi1_ce1 - - + + - + spi_2:cs_2->rph:g16_spi1_ce2 - - + + - + spi_2:copi->mb:4 - + - + spi_2:cipo->mb:3 - - + + - + spi_2:sclk->mb:2 - + - + spi_2:cs_3->mb:1 - + - + spi_2:copi->pmod1:2 - + - + spi_2:cipo->pmod1:3 - - + + - + spi_2:sclk->pmod1:4 - + - + spi_2:cs_0->pmod1:1 - + - + spi_2:cs_1->pmod1:9 - + - + spi_2:cs_2->pmod1:10 - + gpio_board - -gpio_board - -gpo_0-7 - -gpi_0-7 - -gpi_8-12 - -gpi_13-15 - -gpi_16 + +gpio_board + +gpo_0-7 + +gpi_0-7 + +gpi_8-12 + +gpi_13-15 + +gpi_16 usr - -usrled0-7 - -gpo - -user leds, switches -and joystick - -usrsw0-7 - -gpi - -navsw0-4 - -gpi - -selsw0-2 - -gpi + +usrled0-7 + +gpo + +user leds, switches +and joystick + +usrsw0-7 + +gpi + +navsw0-4 + +gpi + +selsw0-2 + +gpi - + gpio_board:gpo_0-7->usr:led_0-7 - - + + - + gpio_board:gpi_0-7->usr:sw_0-7 - - + + - + gpio_board:gpi_8-12->usr:navsw_0-4 - - + + - + gpio_board:gpi_13-15->usr:selsw_0-2 - - + + - + gpio_board:gpi_16->microsd:det - - + + gpio_rph - -gpio_rph - -gpio_0-27 + +gpio_rph + +gpio_0-27 - + gpio_rph:gpio_0-27->rph:g0 - - - + + + - + gpio_rph:gpio_0-27->rph:g1 - - - + + + - + gpio_rph:gpio_0-27->rph:g2_sda - - - + + + - + gpio_rph:gpio_0-27->rph:g3_scl - - - + + + - + gpio_rph:gpio_0-27->rph:g4 - - - + + + - + gpio_rph:gpio_0-27->rph:g5 - - - + + + - + gpio_rph:gpio_0-27->rph:g6 - - - + + + - + gpio_rph:gpio_0-27->rph:g7_spi0_ce1 - - - + + + - + gpio_rph:gpio_0-27->rph:g8_spi0_ce0 - - - + + + - + gpio_rph:gpio_0-27->rph:g9_spi0_cipo - - - + + + - + gpio_rph:gpio_0-27->rph:g10_spi0_copi - - - + + + - + gpio_rph:gpio_0-27->rph:g11_spi0_sclk - - - + + + - + gpio_rph:gpio_0-27->rph:g12 - - - + + + - + gpio_rph:gpio_0-27->rph:g13 - - - + + + - + gpio_rph:gpio_0-27->rph:txd0 - - - + + + - + gpio_rph:gpio_0-27->rph:rxd0 - - - + + + - + gpio_rph:gpio_0-27->rph:g16_spi1_ce2 - - - + + + - + gpio_rph:gpio_0-27->rph:g17_spi1_ce1 - - - + + + - + gpio_rph:gpio_0-27->rph:g18_spi1_ce0 - - - + + + - + gpio_rph:gpio_0-27->rph:g19_spi1_cipo - - - + + + - + gpio_rph:gpio_0-27->rph:g20_spi1_copi - - - + + + - + gpio_rph:gpio_0-27->rph:g21_spi1_sclk - - - + + + - + gpio_rph:gpio_0-27->rph:g22 - - - + + + - + gpio_rph:gpio_0-27->rph:g23 - - - + + + - + gpio_rph:gpio_0-27->rph:g24 - - - + + + - + gpio_rph:gpio_0-27->rph:g25 - - - + + + - + gpio_rph:gpio_0-27->rph:g26 - - - + + + - + gpio_rph:gpio_0-27->rph:g27 - - - + + + @@ -1410,98 +1436,98 @@ gpio_0-13 - + gpio_ah:gpio_0-13->ah:tmpio0 - + gpio_ah:gpio_0-13->ah:tmpio1 - + gpio_ah:gpio_0-13->ah:tmpio2 - + gpio_ah:gpio_0-13->ah:tmpio3 - + gpio_ah:gpio_0-13->ah:tmpio4 - + gpio_ah:gpio_0-13->ah:tmpio5 - + gpio_ah:gpio_0-13->ah:tmpio6 - + gpio_ah:gpio_0-13->ah:tmpio7 - + gpio_ah:gpio_0-13->ah:tmpio8 - + gpio_ah:gpio_0-13->ah:tmpio9 - + gpio_ah:gpio_0-13->ah:tmpio10 - + gpio_ah:gpio_0-13->ah:tmpio11 - + gpio_ah:gpio_0-13->ah:tmpio12 - + gpio_ah:gpio_0-13->ah:tmpio13 @@ -1510,337 +1536,337 @@ gpio_pmod0 - -gpio_pmod0 - -gpio_0-7 + +gpio_pmod0 + +gpio_0-7 - + gpio_pmod0:gpio_0-7->pmod0:1 - - - + + + - + gpio_pmod0:gpio_0-7->pmod0:2 - - + + - + gpio_pmod0:gpio_0-7->pmod0:3 - - + + - + gpio_pmod0:gpio_0-7->pmod0:4 - - - + + + - + gpio_pmod0:gpio_0-7->pmod0:7 - - + + - + gpio_pmod0:gpio_0-7->pmod0:8 - - - + + + - + gpio_pmod0:gpio_0-7->pmod0:9 - - - + + + - + gpio_pmod0:gpio_0-7->pmod0:10 - - - + + + gpio_pmodc - -gpio_pmodc - -gpio_0-5 + +gpio_pmodc + +gpio_0-5 - + pmodc - -pmodc_1 - -gpio - -Pmod C - -pmodc_2 - -gpio - -pmodc_3 - -gpio - -pmodc_4 - -gpio - -pmodc_5 - -gpio - -pmodc_6 - -gpio + +pmodc_1 + +gpio + +Pmod C + +pmodc_2 + +gpio + +pmodc_3 + +gpio + +pmodc_4 + +gpio + +pmodc_5 + +gpio + +pmodc_6 + +gpio - + gpio_pmodc:gpio_0-5->pmodc:1 - - - + + + - + gpio_pmodc:gpio_0-5->pmodc:2 - - - + + + - + gpio_pmodc:gpio_0-5->pmodc:3 - - - + + + - + gpio_pmodc:gpio_0-5->pmodc:4 - - - + + + - + gpio_pmodc:gpio_0-5->pmodc:5 - - - + + + - + gpio_pmodc:gpio_0-5->pmodc:6 - - - + + + gpio_pmod1 - -gpio_pmod1 - -gpio_0-7 + +gpio_pmod1 + +gpio_0-7 - + gpio_pmod1:gpio_0-7->pmod1:1 - - - + + + - + gpio_pmod1:gpio_0-7->pmod1:2 - - - + + + - + gpio_pmod1:gpio_0-7->pmod1:3 - - - + + + - + gpio_pmod1:gpio_0-7->pmod1:4 - - + + - + gpio_pmod1:gpio_0-7->pmod1:7 - - + + - + gpio_pmod1:gpio_0-7->pmod1:8 - - + + - + gpio_pmod1:gpio_0-7->pmod1:9 - - - + + + - + gpio_pmod1:gpio_0-7->pmod1:10 - - + + pwm - -pwm - -0 - -1 - -2 - -3 - -4 - -5 - -6 + +pwm + +0 + +1 + +2 + +3 + +4 + +5 + +6 - + pwm:6->lcd:backlight - + - + pwm:0->rph:g12 - - + + - + pwm:1->rph:g13 - - + + - + pwm:2->rph:g18_spi1_ce0 - - + + - + pwm:3->rph:g19_spi1_cipo - - + + - + pwm:4->rph:g20_spi1_copi - - + + - + pwm:5->rph:g21_spi1_sclk - - + + - + pwm:0->ah:tmpio3 - + - + pwm:1->ah:tmpio5 - + - + pwm:2->ah:tmpio6 - + - + pwm:3->ah:tmpio9 - - + + - + pwm:4->ah:tmpio10 - + - + pwm:5->ah:tmpio11 - - + + - + pwm:0->mb:10 - - + + - + pwm:1->pmod0:2 - - + + - + pwm:2->pmod0:8 - + - + pwm:3->pmod1:2 - + - + pwm:4->pmod1:8 - + From 6489e03871947616cbd763545560f780fba022ca Mon Sep 17 00:00:00 2001 From: Alex Jones Date: Fri, 8 Nov 2024 12:38:40 +0000 Subject: [PATCH 5/5] Update Raspberry Pi Header Pin names to remove SPI The pin names for the Raspberry Pi HAT header's pins in `top_config.toml` had already been stripped to remove references to specific SPI pins (e.g. CE0, CE1, COPI, CIPO, SCK), because of the inconsistencies between the usage of SPI pins on some devices, and to avoid confusion between SPI0/SPI1 and the blocks that are referred to as SPI0/SPI1 on our board (in reality, SPI0 on RPH uses our SPI1, and SPI1 on RPH maps to use our SPI2). This commit just updates the pin mapping diagram to reflect the existing changes to `top_config.toml` and the RTL. --- doc/ip/pinmux/pin_mappings.dot | 86 +- doc/ip/pinmux/pin_mappings.svg | 1692 ++++++++++++++++---------------- 2 files changed, 889 insertions(+), 889 deletions(-) diff --git a/doc/ip/pinmux/pin_mappings.dot b/doc/ip/pinmux/pin_mappings.dot index 0bb8b9177..c4099e1d0 100644 --- a/doc/ip/pinmux/pin_mappings.dot +++ b/doc/ip/pinmux/pin_mappings.dot @@ -217,27 +217,27 @@ digraph { rph_g0gpio, sda Raspberry Pi HAT -
rph_g1gpio, scl
-
rph_g2_sdagpio, sda
-
rph_g3_sclgpio, scl
-
rph_g4gpio
-
rph_g5gpio
-
rph_g6gpio
-
rph_g7_spi0_ce1gpio, cs
-
rph_g8_spi0_ce0gpio, cs
-
rph_g9_spi0_cipogpio, cipo
-
rph_g10_spi0_copigpio, copi
-
rph_g11_spi0_sclkgpio, sclk
+
rph_g1gpio, scl
+
rph_g2_sdagpio, sda
+
rph_g3_sclgpio, scl
+
rph_g4gpio
+
rph_g5gpio
+
rph_g6gpio
+
rph_g7gpio, cs
+
rph_g8gpio, cs
+
rph_g9gpio, cipo
+
rph_g10gpio, copi
+
rph_g11gpio, sclk
rph_g12gpio, pwm
rph_g13gpio, pwm
rph_txd0gpio, tx
rph_rxd0gpio, rx
-
rph_g16_spi1_ce2gpio, cs
-
rph_g17_spi1_ce1gpio, cs
-
rph_g18_spi1_ce0gpio, cs, pwm
-
rph_g19_spi1_cipogpio, cipo, pwm
-
rph_g20_spi1_copigpio, copi, pwm
-
rph_g21_spi1_sclkgpio, sclk, pwm
+
rph_g16gpio, cs
+
rph_g17gpio, cs
+
rph_g18gpio, cs, pwm
+
rph_g19gpio, cipo, pwm
+
rph_g20gpio, copi, pwm
+
rph_g21gpio, sclk, pwm
rph_g22gpio
rph_g23gpio
rph_g24gpio
@@ -423,11 +423,11 @@ digraph { spi_1:cs_1 -> pmod0:9; spi_1:cs_2 -> pmod0:10; - spi_1:copi -> rph:g10_spi0_copi; - spi_1:cipo -> rph:g9_spi0_cipo [dir=back]; - spi_1:sclk -> rph:g11_spi0_sclk; - spi_1:cs_1 -> rph:g7_spi0_ce1; - spi_1:cs_0 -> rph:g8_spi0_ce0; + spi_1:copi -> rph:g10; + spi_1:cipo -> rph:g9 [dir=back]; + spi_1:sclk -> rph:g11; + spi_1:cs_1 -> rph:g7; + spi_1:cs_0 -> rph:g8; spi_1:copi -> ah:tmpio11; spi_1:cipo -> ah:tmpio12 [dir=back]; @@ -441,12 +441,12 @@ digraph { spi_2:cs_1 -> pmod1:9; spi_2:cs_2 -> pmod1:10; - spi_2:copi -> rph:g20_spi1_copi; - spi_2:cipo -> rph:g19_spi1_cipo [dir=back]; - spi_2:sclk -> rph:g21_spi1_sclk; - spi_2:cs_0 -> rph:g18_spi1_ce0; - spi_2:cs_1 -> rph:g17_spi1_ce1; - spi_2:cs_2 -> rph:g16_spi1_ce2; + spi_2:copi -> rph:g20; + spi_2:cipo -> rph:g19 [dir=back]; + spi_2:sclk -> rph:g21; + spi_2:cs_0 -> rph:g18; + spi_2:cs_1 -> rph:g17; + spi_2:cs_2 -> rph:g16; spi_2:copi -> mb:4; spi_2:cipo -> mb:3 [dir=back]; @@ -473,10 +473,10 @@ digraph { pwm:0 -> rph:g12; pwm:1 -> rph:g13; - pwm:2 -> rph:g18_spi1_ce0; - pwm:3 -> rph:g19_spi1_cipo; - pwm:4 -> rph:g20_spi1_copi; - pwm:5 -> rph:g21_spi1_sclk; + pwm:2 -> rph:g18; + pwm:3 -> rph:g19; + pwm:4 -> rph:g20; + pwm:5 -> rph:g21; // GPIOs edge [dir=forward color=grey]; @@ -496,21 +496,21 @@ digraph { gpio_rph:"gpio_0-27" -> rph:g4; gpio_rph:"gpio_0-27" -> rph:g5; gpio_rph:"gpio_0-27" -> rph:g6; - gpio_rph:"gpio_0-27" -> rph:g7_spi0_ce1; - gpio_rph:"gpio_0-27" -> rph:g8_spi0_ce0; - gpio_rph:"gpio_0-27" -> rph:g9_spi0_cipo; - gpio_rph:"gpio_0-27" -> rph:g10_spi0_copi; - gpio_rph:"gpio_0-27" -> rph:g11_spi0_sclk; + gpio_rph:"gpio_0-27" -> rph:g7; + gpio_rph:"gpio_0-27" -> rph:g8; + gpio_rph:"gpio_0-27" -> rph:g9; + gpio_rph:"gpio_0-27" -> rph:g10; + gpio_rph:"gpio_0-27" -> rph:g11; gpio_rph:"gpio_0-27" -> rph:g12; gpio_rph:"gpio_0-27" -> rph:g13; gpio_rph:"gpio_0-27" -> rph:txd0; gpio_rph:"gpio_0-27" -> rph:rxd0; - gpio_rph:"gpio_0-27" -> rph:g16_spi1_ce2; - gpio_rph:"gpio_0-27" -> rph:g17_spi1_ce1; - gpio_rph:"gpio_0-27" -> rph:g18_spi1_ce0; - gpio_rph:"gpio_0-27" -> rph:g19_spi1_cipo; - gpio_rph:"gpio_0-27" -> rph:g20_spi1_copi; - gpio_rph:"gpio_0-27" -> rph:g21_spi1_sclk; + gpio_rph:"gpio_0-27" -> rph:g16; + gpio_rph:"gpio_0-27" -> rph:g17; + gpio_rph:"gpio_0-27" -> rph:g18; + gpio_rph:"gpio_0-27" -> rph:g19; + gpio_rph:"gpio_0-27" -> rph:g20; + gpio_rph:"gpio_0-27" -> rph:g21; gpio_rph:"gpio_0-27" -> rph:g22; gpio_rph:"gpio_0-27" -> rph:g23; gpio_rph:"gpio_0-27" -> rph:g24; diff --git a/doc/ip/pinmux/pin_mappings.svg b/doc/ip/pinmux/pin_mappings.svg index 00a1104e4..3ac0e5d7f 100644 --- a/doc/ip/pinmux/pin_mappings.svg +++ b/doc/ip/pinmux/pin_mappings.svg @@ -4,11 +4,11 @@ - + %3 - + uart_0 @@ -22,35 +22,35 @@ usb - -ser0_tx - -tx - -main usb - -ser0_rx - -rx - -ser1_tx - -tx - -ser1_rx - -rx + +ser0_tx + +tx + +main usb + +ser0_rx + +rx + +ser1_tx + +tx + +ser1_rx + +rx uart_0:tx->usb:ser0_tx - - + + uart_0:rx->usb:ser0_rx - + @@ -66,327 +66,327 @@ uart_1:tx->usb:ser1_tx - - + + uart_1:rx->usb:ser1_rx - + rph - -rph_g0 - -gpio, sda - -Raspberry Pi HAT - -rph_g1 - -gpio, scl - -rph_g2_sda - -gpio, sda - -rph_g3_scl - -gpio, scl - -rph_g4 - -gpio - -rph_g5 - -gpio - -rph_g6 - -gpio - -rph_g7_spi0_ce1 - -gpio, cs - -rph_g8_spi0_ce0 - -gpio, cs - -rph_g9_spi0_cipo - -gpio, cipo - -rph_g10_spi0_copi - -gpio, copi - -rph_g11_spi0_sclk - -gpio, sclk - -rph_g12 - -gpio, pwm - -rph_g13 - -gpio, pwm - -rph_txd0 - -gpio, tx - -rph_rxd0 - -gpio, rx - -rph_g16_spi1_ce2 - -gpio, cs - -rph_g17_spi1_ce1 - -gpio, cs - -rph_g18_spi1_ce0 - -gpio, cs, pwm - -rph_g19_spi1_cipo - -gpio, cipo, pwm - -rph_g20_spi1_copi - -gpio, copi, pwm - -rph_g21_spi1_sclk - -gpio, sclk, pwm - -rph_g22 - -gpio - -rph_g23 - -gpio - -rph_g24 - -gpio - -rph_g25 - -gpio - -rph_g26 - -gpio - -rph_g27 - -gpio + +rph_g0 + +gpio, sda + +Raspberry Pi HAT + +rph_g1 + +gpio, scl + +rph_g2_sda + +gpio, sda + +rph_g3_scl + +gpio, scl + +rph_g4 + +gpio + +rph_g5 + +gpio + +rph_g6 + +gpio + +rph_g7 + +gpio, cs + +rph_g8 + +gpio, cs + +rph_g9 + +gpio, cipo + +rph_g10 + +gpio, copi + +rph_g11 + +gpio, sclk + +rph_g12 + +gpio, pwm + +rph_g13 + +gpio, pwm + +rph_txd0 + +gpio, tx + +rph_rxd0 + +gpio, rx + +rph_g16 + +gpio, cs + +rph_g17 + +gpio, cs + +rph_g18 + +gpio, cs, pwm + +rph_g19 + +gpio, cipo, pwm + +rph_g20 + +gpio, copi, pwm + +rph_g21 + +gpio, sclk, pwm + +rph_g22 + +gpio + +rph_g23 + +gpio + +rph_g24 + +gpio + +rph_g25 + +gpio + +rph_g26 + +gpio + +rph_g27 + +gpio uart_1:tx->rph:txd0 - - + + uart_1:rx->rph:rxd0 - + ah - -ah_tmpio0 - -gpio, rx - -Arduino Shield - -ah_tmpio1 - -gpio, tx - -ah_tmpio2 - -gpio - -ah_tmpio3 - -gpio, pwm - -ah_tmpio4 - -gpio - -ah_tmpio5 - -gpio, pwm - -ah_tmpio6 - -gpio, pwm - -ah_tmpio7 - -gpio - -ah_tmpio8 - -gpio - -ah_tmpio9 - -gpio, pwm - -ah_tmpio10 - -gpio, pwm, cs - -ah_tmpio11 - -gpio, pwm, copi - -ah_tmpio12 - -gpio, cipo - -ah_tmpio13 - -gpio, sclk + +ah_tmpio0 + +gpio, rx + +Arduino Shield + +ah_tmpio1 + +gpio, tx + +ah_tmpio2 + +gpio + +ah_tmpio3 + +gpio, pwm + +ah_tmpio4 + +gpio + +ah_tmpio5 + +gpio, pwm + +ah_tmpio6 + +gpio, pwm + +ah_tmpio7 + +gpio + +ah_tmpio8 + +gpio + +ah_tmpio9 + +gpio, pwm + +ah_tmpio10 + +gpio, pwm, cs + +ah_tmpio11 + +gpio, pwm, copi + +ah_tmpio12 + +gpio, cipo + +ah_tmpio13 + +gpio, sclk uart_1:tx->ah:tmpio1 - - + + uart_1:rx->ah:tmpio0 - + mb - -mb0 - - -mikroBUS Click - -mb1 - -cs - -mb2 - -sclk - -mb3 - -cipo - -mb4 - -copi - -mb5 - -sda - -mb6 - -scl - -mb7 - -tx - -mb8 - -rx - -mb9 - -mb10 - -pwm + +mb0 + + +mikroBUS Click + +mb1 + +cs + +mb2 + +sclk + +mb3 + +cipo + +mb4 + +copi + +mb5 + +sda + +mb6 + +scl + +mb7 + +tx + +mb8 + +rx + +mb9 + +mb10 + +pwm uart_1:tx->mb:7 - - + + uart_1:rx->mb:8 - + pmod0 - -pmod0_1 - -gpio, cs - -Pmod 0 -types 1A, 2A, 3A or 6A - -pmod0_2 - -gpio, copi, pwm, tx - -pmod0_3 - -gpio, cipo, scl, rx - -pmod0_4 - -gpio, sclk, sda - -pmod0_7 - -gpio - -pmod0_8 - -gpio, pwm - -pmod0_9 - -gpio, cs - -pmod0_10 - -gpio, cs + +pmod0_1 + +gpio, cs + +Pmod 0 +types 1A, 2A, 3A or 6A + +pmod0_2 + +gpio, copi, pwm, tx + +pmod0_3 + +gpio, cipo, scl, rx + +pmod0_4 + +gpio, sclk, sda + +pmod0_7 + +gpio + +pmod0_8 + +gpio, pwm + +pmod0_9 + +gpio, cs + +pmod0_10 + +gpio, cs uart_1:tx->pmod0:2 - - + + uart_1:rx->pmod0:3 - + @@ -402,117 +402,117 @@ uart_2:tx->usb:ser1_tx - - + + uart_2:rx->usb:ser1_rx - + rs485 - -rs485_tx - -tx - -rs485 - -rs485_rx - -rx + +rs485_tx + +tx + +rs485 + +rs485_rx + +rx uart_2:tx->rs485:tx - - + + uart_2:rx->rs485:rx - + rs232 - -rs232_tx - -tx - -rs232 - -rs232_rx - -rx + +rs232_tx + +tx + +rs232 + +rs232_rx + +rx uart_2:tx->rs232:tx - - + + uart_2:rx->rs232:rx - + pmod1 - -pmod1_1 - -gpio, cs - -Pmod 1 -types 1A, 2A, 3A or 6A - -pmod1_2 - -gpio, copi, pwm, tx - -pmod1_3 - -gpio, cipo, scl, rx - -pmod1_4 - -gpio, sclk, sda - -pmod1_7 - -gpio - -pmod1_8 - -gpio, pwm - -pmod1_9 - -gpio, cs - -pmod1_10 - -gpio, cs + +pmod1_1 + +gpio, cs + +Pmod 1 +types 1A, 2A, 3A or 6A + +pmod1_2 + +gpio, copi, pwm, tx + +pmod1_3 + +gpio, cipo, scl, rx + +pmod1_4 + +gpio, sclk, sda + +pmod1_7 + +gpio + +pmod1_8 + +gpio, pwm + +pmod1_9 + +gpio, cs + +pmod1_10 + +gpio, cs uart_2:tx->pmod1:2 - - + + uart_2:rx->pmod1:3 - - + + @@ -527,66 +527,66 @@ qwiic - -sda0 - -sda - -qwiic - -scl0 - -scl - -sda1 - -sda - -scl1 - -scl + +sda0 + +sda + +qwiic + +scl0 + +scl + +sda1 + +sda + +scl1 + +scl i2c_0:sda->qwiic:sda0 - + - + i2c_0:scl->qwiic:scl0 - + - + i2c_0:sda->rph:g0 - + - + i2c_0:scl->rph:g1 - + - + i2c_0:sda->pmod0:4 - + - + i2c_0:scl->pmod0:3 - + - + @@ -601,58 +601,58 @@ i2c_1:sda->qwiic:sda1 - + - + i2c_1:scl->qwiic:scl1 - + - + i2c_1:sda->rph:g2_sda - + - + i2c_1:scl->rph:g3_scl - + - + i2c_1:sda->mb:5 - + - + i2c_1:scl->mb:6 - + - + i2c_1:sda->pmod1:4 - + - + i2c_1:scl->pmod1:3 - + - + @@ -673,110 +673,110 @@ appspi - -appspi_d0 - -copi - -flash - -appspi_d1 - -cipo - -appspi_d2 - -appspi_d3 - -appspi_clk - -sclk - -appspi_cs - -cs + +appspi_d0 + +copi + +flash + +appspi_d1 + +cipo + +appspi_d2 + +appspi_d3 + +appspi_clk + +sclk + +appspi_cs + +cs spi_0:copi->appspi:d0 - - + + spi_0:cipo->appspi:d1 - + spi_0:sclk->appspi:clk - - + + spi_0:cs_0->appspi:cs - - + + microsd - -microsd_cmd - -copi - -MicroSD card - -microsd_clk - -sclk - -microsd_dat0 - -cipo - -microsd_dat1 - -cipo - -microsd_dat2 - -cipo - -microsd_dat3 - -cs - -microsd_det - -gpi + +microsd_cmd + +copi + +MicroSD card + +microsd_clk + +sclk + +microsd_dat0 + +cipo + +microsd_dat1 + +cipo + +microsd_dat2 + +cipo + +microsd_dat3 + +cs + +microsd_det + +gpi spi_0:copi->microsd:cmd - - + + spi_0:cipo->microsd:dat0 - + spi_0:sclk->microsd:clk - - + + spi_0:cs_1->microsd:dat3 - - + + @@ -799,62 +799,62 @@ lcd - -lcd_copi - -copi - -lcd - -lcd_clk - -sclk - -lcd_cs - -cs - -lcd_dc - -gpo - -lcd_rst - -gpo - -lcd_backlight - -gpo + +lcd_copi + +copi + +lcd + +lcd_clk + +sclk + +lcd_cs + +cs + +lcd_dc + +gpo + +lcd_rst + +gpo + +lcd_backlight + +gpo spi_lcd:copi->lcd:copi - - + + spi_lcd:sclk->lcd:clk - - + + spi_lcd:cs_0->lcd:cs - - + + spi_lcd:cs_1->lcd:dc - - + + spi_lcd:cs_2->lcd:rst - - + + @@ -875,58 +875,58 @@ ethmac - -ethmac_copi - -copi - -ethernet - -ethmac_cipo - -cipo - -ethmac_sclk - -sclk - -ethmac_cs - -cs - -ethmac_rst - -gpo + +ethmac_copi + +copi + +ethernet + +ethmac_cipo + +cipo + +ethmac_sclk + +sclk + +ethmac_cs + +cs + +ethmac_rst + +gpo spi_ethmac:copi->ethmac:copi - - + + spi_ethmac:cipo->ethmac:cipo - + spi_ethmac:sclk->ethmac:sclk - - + + spi_ethmac:cs_0->ethmac:cs - - + + spi_ethmac:cs_1->ethmac:rst - - + + @@ -950,93 +950,93 @@ -spi_1:copi->rph:g10_spi0_copi - - +spi_1:copi->rph:g10 + + -spi_1:cipo->rph:g9_spi0_cipo - +spi_1:cipo->rph:g9 + -spi_1:sclk->rph:g11_spi0_sclk - - +spi_1:sclk->rph:g11 + + -spi_1:cs_1->rph:g7_spi0_ce1 - - +spi_1:cs_1->rph:g7 + + -spi_1:cs_0->rph:g8_spi0_ce0 - - +spi_1:cs_0->rph:g8 + + spi_1:copi->ah:tmpio11 - - + + spi_1:cipo->ah:tmpio12 - + spi_1:sclk->ah:tmpio13 - - + + spi_1:cs_3->ah:tmpio10 - - + + spi_1:copi->pmod0:2 - - + + spi_1:cipo->pmod0:3 - - + + spi_1:sclk->pmod0:4 - - + + spi_1:cs_0->pmod0:1 - - + + spi_1:cs_1->pmod0:9 - - + + spi_1:cs_2->pmod0:10 - - + + @@ -1060,99 +1060,99 @@ -spi_2:copi->rph:g20_spi1_copi - - +spi_2:copi->rph:g20 + + -spi_2:cipo->rph:g19_spi1_cipo - - +spi_2:cipo->rph:g19 + + -spi_2:sclk->rph:g21_spi1_sclk - - +spi_2:sclk->rph:g21 + + -spi_2:cs_0->rph:g18_spi1_ce0 - - +spi_2:cs_0->rph:g18 + + -spi_2:cs_1->rph:g17_spi1_ce1 - - +spi_2:cs_1->rph:g17 + + -spi_2:cs_2->rph:g16_spi1_ce2 - - +spi_2:cs_2->rph:g16 + + spi_2:copi->mb:4 - - + + spi_2:cipo->mb:3 - + spi_2:sclk->mb:2 - - + + spi_2:cs_3->mb:1 - - + + spi_2:copi->pmod1:2 - - + + spi_2:cipo->pmod1:3 - + spi_2:sclk->pmod1:4 - - + + spi_2:cs_0->pmod1:1 - - + + spi_2:cs_1->pmod1:9 - - + + spi_2:cs_2->pmod1:10 - - + + @@ -1173,54 +1173,54 @@ usr - -usrled0-7 - -gpo - -user leds, switches -and joystick - -usrsw0-7 - -gpi - -navsw0-4 - -gpi - -selsw0-2 - -gpi + +usrled0-7 + +gpo + +user leds, switches +and joystick + +usrsw0-7 + +gpi + +navsw0-4 + +gpi + +selsw0-2 + +gpi gpio_board:gpo_0-7->usr:led_0-7 - - + + gpio_board:gpi_0-7->usr:sw_0-7 - + gpio_board:gpi_8-12->usr:navsw_0-4 - + gpio_board:gpi_13-15->usr:selsw_0-2 - + gpio_board:gpi_16->microsd:det - + @@ -1234,198 +1234,198 @@ gpio_rph:gpio_0-27->rph:g0 - + - + gpio_rph:gpio_0-27->rph:g1 - + - + gpio_rph:gpio_0-27->rph:g2_sda - + - + gpio_rph:gpio_0-27->rph:g3_scl - - - + + + gpio_rph:gpio_0-27->rph:g4 - - - + + + gpio_rph:gpio_0-27->rph:g5 - + - + gpio_rph:gpio_0-27->rph:g6 - - - + + + -gpio_rph:gpio_0-27->rph:g7_spi0_ce1 - +gpio_rph:gpio_0-27->rph:g7 + - + -gpio_rph:gpio_0-27->rph:g8_spi0_ce0 - - - +gpio_rph:gpio_0-27->rph:g8 + + + -gpio_rph:gpio_0-27->rph:g9_spi0_cipo - - - +gpio_rph:gpio_0-27->rph:g9 + + + -gpio_rph:gpio_0-27->rph:g10_spi0_copi - +gpio_rph:gpio_0-27->rph:g10 + - + -gpio_rph:gpio_0-27->rph:g11_spi0_sclk - +gpio_rph:gpio_0-27->rph:g11 + - + gpio_rph:gpio_0-27->rph:g12 - + - + gpio_rph:gpio_0-27->rph:g13 - + - + gpio_rph:gpio_0-27->rph:txd0 - + - + gpio_rph:gpio_0-27->rph:rxd0 - + - + -gpio_rph:gpio_0-27->rph:g16_spi1_ce2 - +gpio_rph:gpio_0-27->rph:g16 + - + -gpio_rph:gpio_0-27->rph:g17_spi1_ce1 - +gpio_rph:gpio_0-27->rph:g17 + - + -gpio_rph:gpio_0-27->rph:g18_spi1_ce0 - - - +gpio_rph:gpio_0-27->rph:g18 + + + -gpio_rph:gpio_0-27->rph:g19_spi1_cipo - - - +gpio_rph:gpio_0-27->rph:g19 + + + -gpio_rph:gpio_0-27->rph:g20_spi1_copi - +gpio_rph:gpio_0-27->rph:g20 + - + -gpio_rph:gpio_0-27->rph:g21_spi1_sclk - - - +gpio_rph:gpio_0-27->rph:g21 + + + gpio_rph:gpio_0-27->rph:g22 - + - + gpio_rph:gpio_0-27->rph:g23 - - - + + + gpio_rph:gpio_0-27->rph:g24 - - - + + + gpio_rph:gpio_0-27->rph:g25 - + - + gpio_rph:gpio_0-27->rph:g26 - + - + gpio_rph:gpio_0-27->rph:g27 - + - + @@ -1438,100 +1438,100 @@ gpio_ah:gpio_0-13->ah:tmpio0 - + - + gpio_ah:gpio_0-13->ah:tmpio1 - + - + gpio_ah:gpio_0-13->ah:tmpio2 - + - + gpio_ah:gpio_0-13->ah:tmpio3 - + - + gpio_ah:gpio_0-13->ah:tmpio4 - + - + gpio_ah:gpio_0-13->ah:tmpio5 - + - + gpio_ah:gpio_0-13->ah:tmpio6 - + - + gpio_ah:gpio_0-13->ah:tmpio7 - + - + gpio_ah:gpio_0-13->ah:tmpio8 - + - + gpio_ah:gpio_0-13->ah:tmpio9 - + - + gpio_ah:gpio_0-13->ah:tmpio10 - + - + gpio_ah:gpio_0-13->ah:tmpio11 - + - + gpio_ah:gpio_0-13->ah:tmpio12 - + - + gpio_ah:gpio_0-13->ah:tmpio13 - + - + @@ -1544,58 +1544,58 @@ gpio_pmod0:gpio_0-7->pmod0:1 - - - + + + gpio_pmod0:gpio_0-7->pmod0:2 - + - + gpio_pmod0:gpio_0-7->pmod0:3 - + - + gpio_pmod0:gpio_0-7->pmod0:4 - + - + gpio_pmod0:gpio_0-7->pmod0:7 - + - + gpio_pmod0:gpio_0-7->pmod0:8 - + - + gpio_pmod0:gpio_0-7->pmod0:9 - + - + gpio_pmod0:gpio_0-7->pmod0:10 - + - + @@ -1608,74 +1608,74 @@ pmodc - -pmodc_1 - -gpio - -Pmod C - -pmodc_2 - -gpio - -pmodc_3 - -gpio - -pmodc_4 - -gpio - -pmodc_5 - -gpio - -pmodc_6 - -gpio + +pmodc_1 + +gpio + +Pmod C + +pmodc_2 + +gpio + +pmodc_3 + +gpio + +pmodc_4 + +gpio + +pmodc_5 + +gpio + +pmodc_6 + +gpio gpio_pmodc:gpio_0-5->pmodc:1 - + - + gpio_pmodc:gpio_0-5->pmodc:2 - + - + gpio_pmodc:gpio_0-5->pmodc:3 - + - + gpio_pmodc:gpio_0-5->pmodc:4 - + - + gpio_pmodc:gpio_0-5->pmodc:5 - + - + gpio_pmodc:gpio_0-5->pmodc:6 - + - + @@ -1688,58 +1688,58 @@ gpio_pmod1:gpio_0-7->pmod1:1 - + - + gpio_pmod1:gpio_0-7->pmod1:2 - + - + gpio_pmod1:gpio_0-7->pmod1:3 - + - + gpio_pmod1:gpio_0-7->pmod1:4 - + - + gpio_pmod1:gpio_0-7->pmod1:7 - + - + gpio_pmod1:gpio_0-7->pmod1:8 - + - + gpio_pmod1:gpio_0-7->pmod1:9 - + - + gpio_pmod1:gpio_0-7->pmod1:10 - + - + @@ -1764,110 +1764,110 @@ pwm:6->lcd:backlight - - + + pwm:0->rph:g12 - - + + pwm:1->rph:g13 - - + + -pwm:2->rph:g18_spi1_ce0 - - +pwm:2->rph:g18 + + -pwm:3->rph:g19_spi1_cipo - - +pwm:3->rph:g19 + + -pwm:4->rph:g20_spi1_copi - - +pwm:4->rph:g20 + + -pwm:5->rph:g21_spi1_sclk - - +pwm:5->rph:g21 + + pwm:0->ah:tmpio3 - - + + pwm:1->ah:tmpio5 - - + + pwm:2->ah:tmpio6 - - + + pwm:3->ah:tmpio9 - - + + pwm:4->ah:tmpio10 - - + + pwm:5->ah:tmpio11 - - + + pwm:0->mb:10 - - + + pwm:1->pmod0:2 - - + + pwm:2->pmod0:8 - - + + pwm:3->pmod1:2 - - + + pwm:4->pmod1:8 - - + +