From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Tue, 6 Mar 2018 07:00:48 +0000 (+0000)
Subject: change spec to select correct interfaces
X-Git-Tag: convert-csv-opcode-to-binary~5813
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6040d718b2600d243c7a6720fc724b8f3f8169f8;p=libreriscv.git

change spec to select correct interfaces
---

diff --git a/shakti/i_class/pinouts.mdwn b/shakti/i_class/pinouts.mdwn
index 56c42a75f..f12744a34 100644
--- a/shakti/i_class/pinouts.mdwn
+++ b/shakti/i_class/pinouts.mdwn
@@ -434,31 +434,39 @@ ULPI (USB Low Pin-count) 0
 * JTAG0_DO 56 D8/1
 * JTAG0_CK 57 D9/1
 
-## UART0
+## D1:UART0
 
-* UART0_TX 8 A8/1
-* UART0_RX 9 A9/1
+* UART0_TX 58 D10/1
+* UART0_RX 59 D11/1
 
-## SPI0
+## C1:SPI0
 
-* SPI0_CLK 0 A0/1
-* SPI0_NSS 1 A1/1
-* SPI0_MOSI 2 A2/1
-* SPI0_MISO 3 A3/1
+* SPI0_CLK 44 C12/1
+* SPI0_NSS 45 C13/1
+* SPI0_MOSI 46 C14/1
+* SPI0_MISO 47 C15/1
 
-## TWI0
+## D1:TWI0
 
-* TWI0_SDA 12 A12/1
-* TWI0_SCL 13 A13/1
+* TWI0_SDA 60 D12/1
+* TWI0_SCL 61 D13/1
 
 ## PWM
 
+* PWM_0 0 A0/2 
+* PWM_1 1 A1/2 
+* PWM_2 2 A2/2 
+* PWM_3 3 A3/2 
 * PWM_4 4 A4/2 
 * PWM_5 5 A5/2 
 * PWM_6 6 A6/2 
 * PWM_7 7 A7/2 
+* PWM_8 8 A8/2 
+* PWM_9 9 A9/2 
 * PWM_10 10 A10/2 
 * PWM_11 11 A11/2 
+* PWM_12 12 A12/2 
+* PWM_13 13 A13/2 
 * PWM_14 14 A14/2 
 * PWM_15 15 A15/2 
 * PWM_16 16 B0/2 
@@ -486,14 +494,6 @@ ULPI (USB Low Pin-count) 0
 |  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 |             |             |
-|  58 |             | D UART0_TX  |             |             |
-|  59 |             | D UART0_RX  |             |             |
-|  60 |             | D TWI0_SDA  |             |             |
-|  61 |             | D TWI0_SCL  |             |             |
 |  62 |             | D UART1_TX  |             |             |
 |  63 |             | D UART1_RX  |             |             |
 
diff --git a/shakti/i_class/pinouts.py b/shakti/i_class/pinouts.py
index c16663935..aaf458a44 100644
--- a/shakti/i_class/pinouts.py
+++ b/shakti/i_class/pinouts.py
@@ -596,8 +596,8 @@ if __name__ == '__main__':
 
     robotics = ['FB', 'ULPI0/8', 
                 'SD0',
-                'JTAG0', 'UART0', 
-              'SPI0', 'TWI0']
+                'JTAG0', 'D1:UART0', 
+              'C1:SPI0', 'D1:TWI0']
     robotics_pwm = []
     for i in range(32):
         robotics_pwm.append('PWM_%d' % i)