From: Luke Kenneth Casson Leighton Date: Tue, 6 Mar 2018 12:15:16 +0000 (+0000) Subject: add extra bank c X-Git-Tag: convert-csv-opcode-to-binary~5812 X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=096c775c6b0370822b6c7090a337efccbbb8b8c2;p=libreriscv.git add extra bank c --- diff --git a/shakti/i_class/pinouts.mdwn b/shakti/i_class/pinouts.mdwn index f12744a34..f7c988a4e 100644 --- a/shakti/i_class/pinouts.mdwn +++ b/shakti/i_class/pinouts.mdwn @@ -38,115 +38,131 @@ auto-generated by [[pinouts.py]] | 29 | B GPIOB13 | B TWI3_SCL | B PWM_29 | | | 30 | B GPIOB14 | B UART5_TX | B PWM_30 | | | 31 | B GPIOB15 | B UART5_RX | B PWM_31 | | -| 32 | | C ULPI0_CK | | | -| 33 | | C ULPI0_DIR | | | -| 34 | | C ULPI0_STP | | | -| 35 | | C ULPI0_NXT | | | -| 36 | | C ULPI0_D0 | | | -| 37 | | C ULPI0_D1 | | | -| 38 | | C ULPI0_D2 | | | -| 39 | | C ULPI0_D3 | | | -| 40 | | C ULPI0_D4 | | | -| 41 | | C ULPI0_D5 | | | -| 42 | | C ULPI0_D6 | | | -| 43 | | C ULPI0_D7 | | | -| 44 | | C SPI0_CLK | | | -| 45 | | C SPI0_NSS | | | -| 46 | | C SPI0_MOSI | | | -| 47 | | C SPI0_MISO | | | -| 48 | | D SD0_CMD | | | -| 49 | | D SD0_CLK | | | -| 50 | | D SD0_D0 | | | -| 51 | | D SD0_D1 | | | -| 52 | | D SD0_D2 | | | -| 53 | | D SD0_D3 | | | -| 54 | | D JTAG0_MS | | | -| 55 | | D JTAG0_DI | | | -| 56 | | D JTAG0_DO | | | -| 57 | | D JTAG0_CK | | | -| 58 | | D UART0_TX | | | -| 59 | | D UART0_RX | | | -| 60 | | D TWI0_SDA | | | -| 61 | | D TWI0_SCL | | | -| 62 | | D UART1_TX | | | -| 63 | | D UART1_RX | | | -| 64 | | E FB_AD0 | | | -| 65 | | E FB_AD1 | | | -| 66 | | E FB_AD2 | | | -| 67 | | E FB_AD3 | | | -| 68 | | E FB_AD4 | | | -| 69 | | E FB_AD5 | | | -| 70 | | E FB_AD6 | | | -| 71 | | E FB_AD7 | | | -| 72 | | E FB_CS0 | | | -| 73 | | E FB_CS1 | | | -| 74 | | E FB_ALE | | | -| 75 | | E FB_OE | | | -| 76 | | E FB_RW | | | -| 77 | | E FB_TA | | | -| 78 | | E FB_CLK | | | -| 79 | | E FB_A0 | | | -| 80 | | E FB_A1 | | | -| 81 | | E FB_TS | | | -| 82 | | E FB_TBST | | | -| 83 | | E FB_TSIZ0 | | | -| 84 | | E FB_TSIZ1 | | | -| 85 | | E FB_BWE0 | | | -| 86 | | E FB_BWE1 | | | -| 87 | | E FB_BWE2 | | | -| 88 | | E FB_BWE3 | | | -| 89 | | E FB_CS2 | | | -| 90 | | E FB_CS3 | | | -| 91 | | E FB_CS4 | | | -| 92 | | E FB_CS5 | | | -| 94 | | E FB_AD8 | | | -| 95 | | E FB_AD9 | | | -| 96 | | E FB_AD10 | | | -| 97 | | E FB_AD11 | | | -| 98 | | E FB_AD12 | | | -| 99 | | E FB_AD13 | | | -| 100 | | E FB_AD14 | | | -| 101 | | E FB_AD15 | | | +| 32 | C GPIOC0 | C SPI1_CLK | | | +| 33 | C GPIOC1 | C SPI1_NSS | | | +| 34 | C GPIOC2 | C SPI1_MOSI | | | +| 35 | C GPIOC3 | C SPI1_MISO | | | +| 36 | C GPIOC4 | C SPI2_CLK | | | +| 37 | C GPIOC5 | C SPI2_NSS | | | +| 38 | C GPIOC6 | C SPI2_MOSI | | | +| 39 | C GPIOC7 | C SPI2_MISO | | | +| 40 | C GPIOC8 | C UART2_TX | | | +| 41 | C GPIOC9 | C UART2_RX | | | +| 42 | C GPIOC10 | C UART3_TX | | | +| 43 | C GPIOC11 | C UART3_RX | | | +| 44 | C GPIOC12 | C TWI1_SDA | | | +| 45 | C GPIOC13 | C TWI1_SCL | | | +| 46 | C GPIOC14 | C TWI3_SDA | | | +| 47 | C GPIOC15 | C TWI3_SCL | | | +| 48 | | D ULPI0_CK | | | +| 49 | | D ULPI0_DIR | | | +| 50 | | D ULPI0_STP | | | +| 51 | | D ULPI0_NXT | | | +| 52 | | D ULPI0_D0 | | | +| 53 | | D ULPI0_D1 | | | +| 54 | | D ULPI0_D2 | | | +| 55 | | D ULPI0_D3 | | | +| 56 | | D ULPI0_D4 | | | +| 57 | | D ULPI0_D5 | | | +| 58 | | D ULPI0_D6 | | | +| 59 | | D ULPI0_D7 | | | +| 60 | | D SPI0_CLK | | | +| 61 | | D SPI0_NSS | | | +| 62 | | D SPI0_MOSI | | | +| 63 | | D SPI0_MISO | | | +| 64 | | E SD0_CMD | | | +| 65 | | E SD0_CLK | | | +| 66 | | E SD0_D0 | | | +| 67 | | E SD0_D1 | | | +| 68 | | E SD0_D2 | | | +| 69 | | E SD0_D3 | | | +| 70 | | E JTAG0_MS | | | +| 71 | | E JTAG0_DI | | | +| 72 | | E JTAG0_DO | | | +| 73 | | E JTAG0_CK | | | +| 74 | | E UART0_TX | | | +| 75 | | E UART0_RX | | | +| 76 | | E TWI0_SDA | | | +| 77 | | E TWI0_SCL | | | +| 78 | | E UART1_TX | | | +| 79 | | E UART1_RX | | | +| 80 | | F FB_AD0 | | | +| 81 | | F FB_AD1 | | | +| 82 | | F FB_AD2 | | | +| 83 | | F FB_AD3 | | | +| 84 | | F FB_AD4 | | | +| 85 | | F FB_AD5 | | | +| 86 | | F FB_AD6 | | | +| 87 | | F FB_AD7 | | | +| 88 | | F FB_CS0 | | | +| 89 | | F FB_CS1 | | | +| 90 | | F FB_ALE | | | +| 91 | | F FB_OE | | | +| 92 | | F FB_RW | | | +| 93 | | F FB_TA | | | +| 94 | | F FB_CLK | | | +| 95 | | F FB_A0 | | | +| 96 | | F FB_A1 | | | +| 97 | | F FB_TS | | | +| 98 | | F FB_TBST | | | +| 99 | | F FB_TSIZ0 | | | +| 100 | | F FB_TSIZ1 | | | +| 101 | | F FB_BWE0 | | | +| 102 | | F FB_BWE1 | | | +| 103 | | F FB_BWE2 | | | +| 104 | | F FB_BWE3 | | | +| 105 | | F FB_CS2 | | | +| 106 | | F FB_CS3 | | | +| 107 | | F FB_CS4 | | | +| 108 | | F FB_CS5 | | | +| 110 | | F FB_AD8 | | | +| 111 | | F FB_AD9 | | | +| 112 | | F FB_AD10 | | | +| 113 | | F FB_AD11 | | | +| 114 | | F FB_AD12 | | | +| 115 | | F FB_AD13 | | | +| 116 | | F FB_AD14 | | | +| 117 | | F FB_AD15 | | | # Pinouts (Fixed function) ## CTRL_SYS -* 101: 0 TEST -* 102: 0 BOOT_SEL -* 103: 0 NMI# -* 104: 0 RESET# -* 105: 0 CLK24M_IN CLK24M_OUT CLK32K_IN CLK32K_OUT -* 109: 0 PLLTEST PLLREGIO PLLVP25 PLLDV -* 113: 0 PLLVREG PLLGND +* 117: 0 TEST +* 118: 0 BOOT_SEL +* 119: 0 NMI# +* 120: 0 RESET# +* 121: 0 CLK24M_IN CLK24M_OUT CLK32K_IN CLK32K_OUT +* 125: 0 PLLTEST PLLREGIO PLLVP25 PLLDV +* 129: 0 PLLVREG PLLGND ## POWER_CPU -* 115: 1 VDD0_CPU VDD1_CPU VDD2_CPU VDD3_CPU -* 119: 1 VDD4_CPU VDD5_CPU -* 121: 1 GND0_CPU GND1_CPU GND2_CPU GND3_CPU -* 125: 1 GND4_CPU GND5_CPU +* 131: 1 VDD0_CPU VDD1_CPU VDD2_CPU VDD3_CPU +* 135: 1 VDD4_CPU VDD5_CPU +* 137: 1 GND0_CPU GND1_CPU GND2_CPU GND3_CPU +* 141: 1 GND4_CPU GND5_CPU ## POWER_DLL -* 127: 2 VDD0_DLL VDD1_DLL VDD2_DLL -* 130: 2 GND0_DLL GND1_DLL GND2_DLL +* 143: 2 VDD0_DLL VDD1_DLL VDD2_DLL +* 146: 2 GND0_DLL GND1_DLL GND2_DLL ## POWER_GPIO -* 133: 3 VDD_GPIOA VDD_GPIOB VDD_GPIOC VDD_GPIOD -* 137: 3 VDD_GPIOE -* 138: 3 GND_GPIOA GND_GPIOB GND_GPIOC GND_GPIOD -* 142: 3 GND_GPIOE +* 149: 3 VDD_GPIOA VDD_GPIOB VDD_GPIOC VDD_GPIOD +* 153: 3 VDD_GPIOE +* 154: 3 GND_GPIOA GND_GPIOB GND_GPIOC GND_GPIOD +* 158: 3 GND_GPIOE ## POWER_INT -* 143: 4 VDD0_INT VDD1_INT VDD2_INT VDD3_INT -* 147: 4 VDD4_INT VDD5_INT VDD6_INT VDD7_INT -* 151: 4 VDD8_INT VDD9_INT -* 153: 4 GND0_INT GND1_INT GND2_INT GND3_INT -* 157: 4 GND4_INT GND5_INT GND6_INT GND7_INT -* 161: 4 GND8_INT GND9_INT +* 159: 4 VDD0_INT VDD1_INT VDD2_INT VDD3_INT +* 163: 4 VDD4_INT VDD5_INT VDD6_INT VDD7_INT +* 167: 4 VDD8_INT VDD9_INT +* 169: 4 GND0_INT GND1_INT GND2_INT GND3_INT +* 173: 4 GND4_INT GND5_INT GND6_INT GND7_INT +* 177: 4 GND8_INT GND9_INT # Functions (PinMux) @@ -156,52 +172,52 @@ auto-generated by [[pinouts.py]] MC68k FlexBus -* FB_A0 : E15/1 -* FB_A1 : E16/1 -* FB_AD0 : E0/1 -* FB_AD1 : E1/1 -* FB_AD2 : E2/1 -* FB_AD3 : E3/1 -* FB_AD4 : E4/1 -* FB_AD5 : E5/1 -* FB_AD6 : E6/1 -* FB_AD7 : E7/1 -* FB_AD8 : E30/1 -* FB_AD9 : E31/1 -* FB_AD10 : E32/1 -* FB_AD11 : E33/1 -* FB_AD12 : E34/1 -* FB_AD13 : E35/1 -* FB_AD14 : E36/1 -* FB_AD15 : E37/1 -* FB_ALE : E10/1 -* FB_BWE0 : E21/1 -* FB_BWE1 : E22/1 -* FB_BWE2 : E23/1 -* FB_BWE3 : E24/1 -* FB_CLK : E14/1 -* FB_CS0 : E8/1 -* FB_CS1 : E9/1 -* FB_CS2 : E25/1 -* FB_CS3 : E26/1 -* FB_CS4 : E27/1 -* FB_CS5 : E28/1 -* FB_OE : E11/1 -* FB_RW : E12/1 -* FB_TA : E13/1 -* FB_TBST : E18/1 -* FB_TS : E17/1 -* FB_TSIZ0 : E19/1 -* FB_TSIZ1 : E20/1 +* FB_A0 : F15/1 +* FB_A1 : F16/1 +* FB_AD0 : F0/1 +* FB_AD1 : F1/1 +* FB_AD2 : F2/1 +* FB_AD3 : F3/1 +* FB_AD4 : F4/1 +* FB_AD5 : F5/1 +* FB_AD6 : F6/1 +* FB_AD7 : F7/1 +* FB_AD8 : F30/1 +* FB_AD9 : F31/1 +* FB_AD10 : F32/1 +* FB_AD11 : F33/1 +* FB_AD12 : F34/1 +* FB_AD13 : F35/1 +* FB_AD14 : F36/1 +* FB_AD15 : F37/1 +* FB_ALE : F10/1 +* FB_BWE0 : F21/1 +* FB_BWE1 : F22/1 +* FB_BWE2 : F23/1 +* FB_BWE3 : F24/1 +* FB_CLK : F14/1 +* FB_CS0 : F8/1 +* FB_CS1 : F9/1 +* FB_CS2 : F25/1 +* FB_CS3 : F26/1 +* FB_CS4 : F27/1 +* FB_CS5 : F28/1 +* FB_OE : F11/1 +* FB_RW : F12/1 +* FB_TA : F13/1 +* FB_TBST : F18/1 +* FB_TS : F17/1 +* FB_TSIZ0 : F19/1 +* FB_TSIZ1 : F20/1 ## JTAG0 JTAG -* JTAG0_CK : D9/1 -* JTAG0_DI : D7/1 -* JTAG0_DO : D8/1 -* JTAG0_MS : D6/1 +* JTAG0_CK : E9/1 +* JTAG0_DI : E7/1 +* JTAG0_DO : E8/1 +* JTAG0_MS : E6/1 ## PWM @@ -244,53 +260,53 @@ PWM (pulse-width modulation) SD/MMC 0 -* SD0_CLK : D1/1 -* SD0_CMD : D0/1 -* SD0_D0 : D2/1 -* SD0_D1 : D3/1 -* SD0_D2 : D4/1 -* SD0_D3 : D5/1 +* SD0_CLK : E1/1 +* SD0_CMD : E0/1 +* SD0_D0 : E2/1 +* SD0_D1 : E3/1 +* SD0_D2 : E4/1 +* SD0_D3 : E5/1 ## SPI0 SPI (Serial Peripheral Interface) 0 -* SPI0_CLK : A0/1 C12/1 -* SPI0_MISO : A3/1 C15/1 -* SPI0_MOSI : A2/1 C14/1 -* SPI0_NSS : A1/1 C13/1 +* SPI0_CLK : A0/1 D12/1 +* SPI0_MISO : A3/1 D15/1 +* SPI0_MOSI : A2/1 D14/1 +* SPI0_NSS : A1/1 D13/1 ## SPI1 SPI (Serial Peripheral Interface) 1 -* SPI1_CLK : A4/1 -* SPI1_MISO : A7/1 -* SPI1_MOSI : A6/1 -* SPI1_NSS : A5/1 +* SPI1_CLK : A4/1 C0/1 +* SPI1_MISO : A7/1 C3/1 +* SPI1_MOSI : A6/1 C2/1 +* SPI1_NSS : A5/1 C1/1 ## SPI2 SPI (Serial Peripheral Interface) 2 -* SPI2_CLK : B0/1 -* SPI2_MISO : B3/1 -* SPI2_MOSI : B2/1 -* SPI2_NSS : B1/1 +* SPI2_CLK : B0/1 C4/1 +* SPI2_MISO : B3/1 C7/1 +* SPI2_MOSI : B2/1 C6/1 +* SPI2_NSS : B1/1 C5/1 ## TWI0 I2C 0 -* TWI0_SCL : A13/1 D13/1 -* TWI0_SDA : A12/1 D12/1 +* TWI0_SCL : A13/1 E13/1 +* TWI0_SDA : A12/1 E12/1 ## TWI1 I2C 1 -* TWI1_SCL : A15/1 -* TWI1_SDA : A14/1 +* TWI1_SCL : A15/1 C13/1 +* TWI1_SDA : A14/1 C12/1 ## TWI2 @@ -303,36 +319,36 @@ I2C 2 I2C 3 -* TWI3_SCL : B13/1 -* TWI3_SDA : B12/1 +* TWI3_SCL : B13/1 C15/1 +* TWI3_SDA : B12/1 C14/1 ## UART0 UART (TX/RX) 0 -* UART0_RX : A9/1 D11/1 -* UART0_TX : A8/1 D10/1 +* UART0_RX : A9/1 E11/1 +* UART0_TX : A8/1 E10/1 ## UART1 UART (TX/RX) 1 -* UART1_RX : A11/1 D15/1 -* UART1_TX : A10/1 D14/1 +* UART1_RX : A11/1 E15/1 +* UART1_TX : A10/1 E14/1 ## UART2 UART (TX/RX) 2 -* UART2_RX : B5/1 -* UART2_TX : B4/1 +* UART2_RX : B5/1 C9/1 +* UART2_TX : B4/1 C8/1 ## UART3 UART (TX/RX) 3 -* UART3_RX : B7/1 -* UART3_TX : B6/1 +* UART3_RX : B7/1 C11/1 +* UART3_TX : B6/1 C10/1 ## UART4 @@ -352,104 +368,104 @@ UART (TX/RX) 5 ULPI (USB Low Pin-count) 0 -* ULPI0_CK : C0/1 -* ULPI0_D0 : C4/1 -* ULPI0_D1 : C5/1 -* ULPI0_D2 : C6/1 -* ULPI0_D3 : C7/1 -* ULPI0_D4 : C8/1 -* ULPI0_D5 : C9/1 -* ULPI0_D6 : C10/1 -* ULPI0_D7 : C11/1 -* ULPI0_DIR : C1/1 -* ULPI0_NXT : C3/1 -* ULPI0_STP : C2/1 +* ULPI0_CK : D0/1 +* ULPI0_D0 : D4/1 +* ULPI0_D1 : D5/1 +* ULPI0_D2 : D6/1 +* ULPI0_D3 : D7/1 +* ULPI0_D4 : D8/1 +* ULPI0_D5 : D9/1 +* ULPI0_D6 : D10/1 +* ULPI0_D7 : D11/1 +* ULPI0_DIR : D1/1 +* ULPI0_NXT : D3/1 +* ULPI0_STP : D2/1 # Pinmap for Robotics ## FB -* FB_AD0 64 E0/1 -* FB_AD1 65 E1/1 -* FB_AD2 66 E2/1 -* FB_AD3 67 E3/1 -* FB_AD4 68 E4/1 -* FB_AD5 69 E5/1 -* FB_AD6 70 E6/1 -* FB_AD7 71 E7/1 -* FB_CS0 72 E8/1 -* FB_CS1 73 E9/1 -* FB_ALE 74 E10/1 -* FB_OE 75 E11/1 -* FB_RW 76 E12/1 -* FB_TA 77 E13/1 -* FB_CLK 78 E14/1 -* FB_A0 79 E15/1 -* FB_A1 80 E16/1 -* FB_TS 81 E17/1 -* FB_TBST 82 E18/1 -* FB_TSIZ0 83 E19/1 -* FB_TSIZ1 84 E20/1 -* FB_BWE0 85 E21/1 -* FB_BWE1 86 E22/1 -* FB_BWE2 87 E23/1 -* FB_BWE3 88 E24/1 -* FB_CS2 89 E25/1 -* FB_CS3 90 E26/1 -* FB_CS4 91 E27/1 -* FB_CS5 92 E28/1 -* FB_AD8 94 E30/1 -* FB_AD9 95 E31/1 -* FB_AD10 96 E32/1 -* FB_AD11 97 E33/1 -* FB_AD12 98 E34/1 -* FB_AD13 99 E35/1 -* FB_AD14 100 E36/1 -* FB_AD15 101 E37/1 +* FB_AD0 80 F0/1 +* FB_AD1 81 F1/1 +* FB_AD2 82 F2/1 +* FB_AD3 83 F3/1 +* FB_AD4 84 F4/1 +* FB_AD5 85 F5/1 +* FB_AD6 86 F6/1 +* FB_AD7 87 F7/1 +* FB_CS0 88 F8/1 +* FB_CS1 89 F9/1 +* FB_ALE 90 F10/1 +* FB_OE 91 F11/1 +* FB_RW 92 F12/1 +* FB_TA 93 F13/1 +* FB_CLK 94 F14/1 +* FB_A0 95 F15/1 +* FB_A1 96 F16/1 +* FB_TS 97 F17/1 +* FB_TBST 98 F18/1 +* FB_TSIZ0 99 F19/1 +* FB_TSIZ1 100 F20/1 +* FB_BWE0 101 F21/1 +* FB_BWE1 102 F22/1 +* FB_BWE2 103 F23/1 +* FB_BWE3 104 F24/1 +* FB_CS2 105 F25/1 +* FB_CS3 106 F26/1 +* FB_CS4 107 F27/1 +* FB_CS5 108 F28/1 +* FB_AD8 110 F30/1 +* FB_AD9 111 F31/1 +* FB_AD10 112 F32/1 +* FB_AD11 113 F33/1 +* FB_AD12 114 F34/1 +* FB_AD13 115 F35/1 +* FB_AD14 116 F36/1 +* FB_AD15 117 F37/1 ## ULPI0/8 -* ULPI0_CK 32 C0/1 -* ULPI0_DIR 33 C1/1 -* ULPI0_STP 34 C2/1 -* ULPI0_NXT 35 C3/1 -* ULPI0_D0 36 C4/1 -* ULPI0_D1 37 C5/1 -* ULPI0_D2 38 C6/1 -* ULPI0_D3 39 C7/1 +* ULPI0_CK 48 D0/1 +* ULPI0_DIR 49 D1/1 +* ULPI0_STP 50 D2/1 +* ULPI0_NXT 51 D3/1 +* ULPI0_D0 52 D4/1 +* ULPI0_D1 53 D5/1 +* ULPI0_D2 54 D6/1 +* ULPI0_D3 55 D7/1 ## SD0 -* SD0_CMD 48 D0/1 -* SD0_CLK 49 D1/1 -* SD0_D0 50 D2/1 -* SD0_D1 51 D3/1 -* SD0_D2 52 D4/1 -* SD0_D3 53 D5/1 +* SD0_CMD 64 E0/1 +* SD0_CLK 65 E1/1 +* SD0_D0 66 E2/1 +* SD0_D1 67 E3/1 +* SD0_D2 68 E4/1 +* SD0_D3 69 E5/1 ## JTAG0 -* JTAG0_MS 54 D6/1 -* JTAG0_DI 55 D7/1 -* JTAG0_DO 56 D8/1 -* JTAG0_CK 57 D9/1 +* JTAG0_MS 70 E6/1 +* JTAG0_DI 71 E7/1 +* JTAG0_DO 72 E8/1 +* JTAG0_CK 73 E9/1 -## D1:UART0 +## E1:UART0 -* UART0_TX 58 D10/1 -* UART0_RX 59 D11/1 +* UART0_TX 74 E10/1 +* UART0_RX 75 E11/1 -## C1:SPI0 +## D1:SPI0 -* SPI0_CLK 44 C12/1 -* SPI0_NSS 45 C13/1 -* SPI0_MOSI 46 C14/1 -* SPI0_MISO 47 C15/1 +* SPI0_CLK 60 D12/1 +* SPI0_NSS 61 D13/1 +* SPI0_MOSI 62 D14/1 +* SPI0_MISO 63 D15/1 -## D1:TWI0 +## E1:TWI0 -* TWI0_SDA 60 D12/1 -* TWI0_SCL 61 D13/1 +* TWI0_SDA 76 E12/1 +* TWI0_SCL 77 E13/1 ## PWM @@ -490,12 +506,28 @@ ULPI (USB Low Pin-count) 0 | Pin | Mux0 | Mux1 | Mux2 | Mux3 | | --- | ----------- | ----------- | ----------- | ----------- | -| 40 | | C ULPI0_D4 | | | -| 41 | | C ULPI0_D5 | | | -| 42 | | C ULPI0_D6 | | | -| 43 | | C ULPI0_D7 | | | -| 62 | | D UART1_TX | | | -| 63 | | D UART1_RX | | | +| 32 | C GPIOC0 | C SPI1_CLK | | | +| 33 | C GPIOC1 | C SPI1_NSS | | | +| 34 | C GPIOC2 | C SPI1_MOSI | | | +| 35 | C GPIOC3 | C SPI1_MISO | | | +| 36 | C GPIOC4 | C SPI2_CLK | | | +| 37 | C GPIOC5 | C SPI2_NSS | | | +| 38 | C GPIOC6 | C SPI2_MOSI | | | +| 39 | C GPIOC7 | C SPI2_MISO | | | +| 40 | C GPIOC8 | C UART2_TX | | | +| 41 | C GPIOC9 | C UART2_RX | | | +| 42 | C GPIOC10 | C UART3_TX | | | +| 43 | C GPIOC11 | C UART3_RX | | | +| 44 | C GPIOC12 | C TWI1_SDA | | | +| 45 | C GPIOC13 | C TWI1_SCL | | | +| 46 | C GPIOC14 | C TWI3_SDA | | | +| 47 | C GPIOC15 | C TWI3_SCL | | | +| 56 | | D ULPI0_D4 | | | +| 57 | | D ULPI0_D5 | | | +| 58 | | D ULPI0_D6 | | | +| 59 | | D ULPI0_D7 | | | +| 78 | | E UART1_TX | | | +| 79 | | E UART1_RX | | | # Reference Datasheets diff --git a/shakti/i_class/pinouts.py b/shakti/i_class/pinouts.py index aaf458a44..6c03d8ee0 100644 --- a/shakti/i_class/pinouts.py +++ b/shakti/i_class/pinouts.py @@ -436,7 +436,8 @@ if __name__ == '__main__': 'B': 16, 'C': 16, 'D': 16, - 'E': 48, + 'E': 16, + 'F': 48, } bankspec = {} pkeys = pinbanks.keys() @@ -470,29 +471,38 @@ if __name__ == '__main__': pinmerge(pinouts, pwm(bankspec, str(i+16), ('B', i), "B", mux=2)) # Bank C, 32-47 - pinmerge(pinouts, ulpi(bankspec, "0", ('C', 0), "C", 1)) - pinmerge(pinouts, spi(bankspec, "0", ('C', 12), "C", 1)) - - # Bank D, 48-64 - pinmerge(pinouts, sdmmc(bankspec, "0", ('D', 0), "D", 1)) - pinmerge(pinouts, jtag(bankspec, "0", ('D', 6), "D", 1)) - pinmerge(pinouts, uart(bankspec, "0", ('D', 10), "D", 1)) - pinmerge(pinouts, i2c(bankspec, "0", ('D', 12), "D", 1)) - pinmerge(pinouts, uart(bankspec, "1", ('D', 14), "D", 1)) - - # Bank E, 64-111 + pinmerge(pinouts, gpio(bankspec, "", ('C', 0), "C", 0, 16, 0)) + pinmerge(pinouts, spi(bankspec, "1", ('C', 0), "C", 1)) + pinmerge(pinouts, spi(bankspec, "2", ('C', 4), "C", 1)) + pinmerge(pinouts, uart(bankspec, "2", ('C', 8), "C", 1)) + pinmerge(pinouts, uart(bankspec, "3", ('C', 10), "C", 1)) + pinmerge(pinouts, i2c(bankspec, "1", ('C', 12), "C", 1)) + pinmerge(pinouts, i2c(bankspec, "3", ('C', 14), "C", 1)) + + # Bank C, 48-63 + pinmerge(pinouts, ulpi(bankspec, "0", ('D', 0), "D", 1)) + pinmerge(pinouts, spi(bankspec, "0", ('D', 12), "D", 1)) + + # Bank D, 64-80 + pinmerge(pinouts, sdmmc(bankspec, "0", ('E', 0), "E", 1)) + pinmerge(pinouts, jtag(bankspec, "0", ('E', 6), "E", 1)) + pinmerge(pinouts, uart(bankspec, "0", ('E', 10), "E", 1)) + pinmerge(pinouts, i2c(bankspec, "0", ('E', 12), "E", 1)) + pinmerge(pinouts, uart(bankspec, "1", ('E', 14), "E", 1)) + + # Bank F, 80-127 flexspec = { - 'FB_TS': ('FB_ALE', 2, "D"), - 'FB_CS2': ('FB_BWE2', 2, "D"), - 'FB_A0': ('FB_BWE2', 3, "D"), - 'FB_CS3': ('FB_BWE3', 2, "D"), - 'FB_A1': ('FB_BWE3', 3, "D"), - 'FB_TBST': ('FB_OE', 2, "D"), - 'FB_TSIZ0': ('FB_BWE0', 2, "D"), - 'FB_TSIZ1': ('FB_BWE1', 2, "D"), + 'FB_TS': ('FB_ALE', 2, "F"), + 'FB_CS2': ('FB_BWE2', 2, "F"), + 'FB_A0': ('FB_BWE2', 3, "F"), + 'FB_CS3': ('FB_BWE3', 2, "F"), + 'FB_A1': ('FB_BWE3', 3, "F"), + 'FB_TBST': ('FB_OE', 2, "F"), + 'FB_TSIZ0': ('FB_BWE0', 2, "F"), + 'FB_TSIZ1': ('FB_BWE1', 2, "F"), } - pinmerge(pinouts, flexbus1(bankspec, "", ('E', 0), "E", 1)) - pinmerge(pinouts, flexbus2(bankspec, "", ('E', 30), "E", 1, limit=8)) + pinmerge(pinouts, flexbus1(bankspec, "", ('F', 0), "F", 1)) + pinmerge(pinouts, flexbus2(bankspec, "", ('F', 30), "F", 1, limit=8)) print "# Pinouts (PinMux)" print @@ -596,8 +606,8 @@ if __name__ == '__main__': robotics = ['FB', 'ULPI0/8', 'SD0', - 'JTAG0', 'D1:UART0', - 'C1:SPI0', 'D1:TWI0'] + 'JTAG0', 'E1:UART0', + 'D1:SPI0', 'E1:TWI0'] robotics_pwm = [] for i in range(32): robotics_pwm.append('PWM_%d' % i)