From be92c050d161b5ee6497794762379b32b82b2ce3 Mon Sep 17 00:00:00 2001 From: Luke Kenneth Casson Leighton Date: Tue, 6 Mar 2018 12:22:02 +0000 Subject: [PATCH] add RGMII bank G --- shakti/i_class/pinouts.mdwn | 114 ++++++++++++++++++++++++++++-------- shakti/i_class/pinouts.py | 11 +++- 2 files changed, 100 insertions(+), 25 deletions(-) diff --git a/shakti/i_class/pinouts.mdwn b/shakti/i_class/pinouts.mdwn index ed2e89550..14a5b6ef1 100644 --- a/shakti/i_class/pinouts.mdwn +++ b/shakti/i_class/pinouts.mdwn @@ -123,46 +123,66 @@ auto-generated by [[pinouts.py]] | 115 | | F FB_AD13 | | | | 116 | | F FB_AD14 | | | | 117 | | F FB_AD15 | | | +| 128 | | G RG_ERXD0 | | | +| 129 | | G RG_ERXD1 | | | +| 130 | | G RG_ERXD2 | | | +| 131 | | G RG_ERXD3 | | | +| 132 | | G RG_ETXD0 | | | +| 133 | | G RG_ETXD1 | | | +| 134 | | G RG_ETXD2 | | | +| 135 | | G RG_ETXD3 | | | +| 136 | | G RG_FB_CS0 | | | +| 137 | | G RG_FB_CS1 | | | +| 138 | | G RG_ERXCK | | | +| 139 | | G RG_ERXERR | | | +| 140 | | G RG_ERXDV | | | +| 141 | | G RG_EMDC | | | +| 142 | | G RG_EMDIO | | | +| 143 | | G RG_ETXEN | | | +| 144 | | G RG_ETXCK | | | +| 145 | | G RG_ECRS | | | +| 146 | | G RG_ECOL | | | +| 147 | | G RG_ETXERR | | | # Pinouts (Fixed function) ## CTRL_SYS -* 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 +* 137: 0 TEST +* 138: 0 BOOT_SEL +* 139: 0 NMI# +* 140: 0 RESET# +* 141: 0 CLK24M_IN CLK24M_OUT CLK32K_IN CLK32K_OUT +* 145: 0 PLLTEST PLLREGIO PLLVP25 PLLDV +* 149: 0 PLLVREG PLLGND ## POWER_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 +* 151: 1 VDD0_CPU VDD1_CPU VDD2_CPU VDD3_CPU +* 155: 1 VDD4_CPU VDD5_CPU +* 157: 1 GND0_CPU GND1_CPU GND2_CPU GND3_CPU +* 161: 1 GND4_CPU GND5_CPU ## POWER_DLL -* 143: 2 VDD0_DLL VDD1_DLL VDD2_DLL -* 146: 2 GND0_DLL GND1_DLL GND2_DLL +* 163: 2 VDD0_DLL VDD1_DLL VDD2_DLL +* 166: 2 GND0_DLL GND1_DLL GND2_DLL ## POWER_GPIO -* 149: 3 VDD_GPIOA VDD_GPIOB VDD_GPIOC VDD_GPIOD -* 153: 3 VDD_GPIOE VDD_GPIOD -* 155: 3 GND_GPIOA GND_GPIOB GND_GPIOC GND_GPIOD -* 159: 3 GND_GPIOE GND_GPIOF +* 169: 3 VDD_GPIOA VDD_GPIOB VDD_GPIOC VDD_GPIOD +* 173: 3 VDD_GPIOE VDD_GPIOF VDD_GPIOG +* 176: 3 GND_GPIOA GND_GPIOB GND_GPIOC GND_GPIOD +* 180: 3 GND_GPIOE GND_GPIOF GND_GPIOG ## POWER_INT -* 161: 4 VDD0_INT VDD1_INT VDD2_INT VDD3_INT -* 165: 4 VDD4_INT VDD5_INT VDD6_INT VDD7_INT -* 169: 4 VDD8_INT VDD9_INT -* 171: 4 GND0_INT GND1_INT GND2_INT GND3_INT -* 175: 4 GND4_INT GND5_INT GND6_INT GND7_INT -* 179: 4 GND8_INT GND9_INT +* 183: 4 VDD0_INT VDD1_INT VDD2_INT VDD3_INT +* 187: 4 VDD4_INT VDD5_INT VDD6_INT VDD7_INT +* 191: 4 VDD8_INT VDD9_INT +* 193: 4 GND0_INT GND1_INT GND2_INT GND3_INT +* 197: 4 GND4_INT GND5_INT GND6_INT GND7_INT +* 201: 4 GND8_INT GND9_INT # Functions (PinMux) @@ -256,6 +276,31 @@ PWM (pulse-width modulation) * PWM_30 : B14/2 * PWM_31 : B15/2 +## RG + +RGMII Ethernet + +* RG_ECOL : G18/1 +* RG_ECRS : G17/1 +* RG_EMDC : G13/1 +* RG_EMDIO : G14/1 +* RG_ERXCK : G10/1 +* RG_ERXD0 : G0/1 +* RG_ERXD1 : G1/1 +* RG_ERXD2 : G2/1 +* RG_ERXD3 : G3/1 +* RG_ERXDV : G12/1 +* RG_ERXERR : G11/1 +* RG_ETXCK : G16/1 +* RG_ETXD0 : G4/1 +* RG_ETXD1 : G5/1 +* RG_ETXD2 : G6/1 +* RG_ETXD3 : G7/1 +* RG_ETXEN : G15/1 +* RG_ETXERR : G19/1 +* RG_FB_CS0 : G8/1 +* RG_FB_CS1 : G9/1 + ## SD0 SD/MMC 0 @@ -423,6 +468,29 @@ ULPI (USB Low Pin-count) 0 * FB_AD14 116 F36/1 * FB_AD15 117 F37/1 +## RG + +* RG_ERXD0 128 G0/1 +* RG_ERXD1 129 G1/1 +* RG_ERXD2 130 G2/1 +* RG_ERXD3 131 G3/1 +* RG_ETXD0 132 G4/1 +* RG_ETXD1 133 G5/1 +* RG_ETXD2 134 G6/1 +* RG_ETXD3 135 G7/1 +* RG_FB_CS0 136 G8/1 +* RG_FB_CS1 137 G9/1 +* RG_ERXCK 138 G10/1 +* RG_ERXERR 139 G11/1 +* RG_ERXDV 140 G12/1 +* RG_EMDC 141 G13/1 +* RG_EMDIO 142 G14/1 +* RG_ETXEN 143 G15/1 +* RG_ETXCK 144 G16/1 +* RG_ECRS 145 G17/1 +* RG_ECOL 146 G18/1 +* RG_ETXERR 147 G19/1 + ## ULPI0/8 * ULPI0_CK 48 D0/1 diff --git a/shakti/i_class/pinouts.py b/shakti/i_class/pinouts.py index a1ad0225f..8c29b8525 100644 --- a/shakti/i_class/pinouts.py +++ b/shakti/i_class/pinouts.py @@ -438,6 +438,7 @@ if __name__ == '__main__': 'D': 16, 'E': 16, 'F': 48, + 'G': 24, } bankspec = {} pkeys = pinbanks.keys() @@ -504,6 +505,10 @@ if __name__ == '__main__': pinmerge(pinouts, flexbus1(bankspec, "", ('F', 0), "F", 1)) pinmerge(pinouts, flexbus2(bankspec, "", ('F', 30), "F", 1, limit=8)) + # Bank G, 128-151 + + pinmerge(pinouts, rgmii(bankspec, "", ('G', 0), "G", 1)) + print "# Pinouts (PinMux)" print print "auto-generated by [[pinouts.py]]" @@ -546,9 +551,11 @@ if __name__ == '__main__': 'POWER_GPIO': ['VDD_GPIOA', 'VDD_GPIOB', 'VDD_GPIOC', - 'VDD_GPIOD', 'VDD_GPIOE', 'VDD_GPIOD', + 'VDD_GPIOD', 'VDD_GPIOE', 'VDD_GPIOF', + 'VDD_GPIOG', 'GND_GPIOA', 'GND_GPIOB', 'GND_GPIOC', 'GND_GPIOD', 'GND_GPIOE', 'GND_GPIOF', + 'GND_GPIOG', ] } @@ -606,7 +613,7 @@ if __name__ == '__main__': # Robotics scenario. - robotics = ['FB', 'ULPI0/8', + robotics = ['FB', 'RG', 'ULPI0/8', 'SD0', 'JTAG0', 'E1:UART0', 'D1:SPI0', 'E1:TWI0'] -- 2.30.2