From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Fri, 30 Mar 2018 09:34:17 +0000 (+0100)
Subject: renumber interfaces start from zero
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9f443d8464770467561233d194c3eff692bb7d84;p=pinmux.git

renumber interfaces start from zero
---

diff --git a/src/spec/minitest.py b/src/spec/minitest.py
index f0e104e..8821d11 100644
--- a/src/spec/minitest.py
+++ b/src/spec/minitest.py
@@ -22,24 +22,24 @@ def pinspec():
     # Bank B, 16-47
     pinouts.gpio("", ('B', 0), "B", 0, 28, 0)
     pinouts.rgbttl("", ('B', 0), "B", 1, limit=23)
-    pinouts.spi("1", ('B', 10), "B", 2)
+    pinouts.spi("0", ('B', 10), "B", 2)
     pinouts.quadspi("", ('B', 4), "B", 2)
-    pinouts.uart("3", ('B', 16), "B", 2)
-    pinouts.i2c("3", ('B', 18), "B", 2)
+    pinouts.uart("0", ('B', 16), "B", 2)
+    pinouts.i2c("2", ('B', 18), "B", 2)
     pinouts.pwm("", ('B', 21), "B", 0, 3, mux=2)
-    pinouts.sdmmc("1", ('B', 22), "B", 3)
+    pinouts.sdmmc("0", ('B', 22), "B", 3)
     pinouts.eint("", ('B', 0), "B", 0, 4, mux=3)
     pinouts.eint("", ('B', 20), "B", 4, 1, mux=2)
     pinouts.eint("", ('B', 23), "B", 5, 1, mux=1)
-    pinouts.sdmmc("2", ('B', 4), "B", 3)
-    pinouts.jtag("2", ('B', 10), "B", 3)
+    pinouts.sdmmc("1", ('B', 4), "B", 3)
+    pinouts.jtag("1", ('B', 10), "B", 3)
     pinouts.uartfull("0", ('B', 14), "B", 3)
     pinouts.uartfull("1", ('B', 18), "B", 3)
-    pinouts.jtag("1", ('B', 24), "B", 2)
-    pinouts.spi("2", ('B', 24), "B", 1)
-    pinouts.i2c("1", ('B', 0), "B", 2)
-    pinouts.uart("2", ('B', 2), "B", 2)
-    pinouts.uart("4", ('B', 14), "B", 2)
+    pinouts.jtag("0", ('B', 24), "B", 2)
+    pinouts.spi("1", ('B', 24), "B", 1)
+    pinouts.i2c("0", ('B', 0), "B", 2)
+    pinouts.uart("1", ('B', 2), "B", 2)
+    pinouts.uart("2", ('B', 14), "B", 2)
 
 
     print ("""# Pinouts (PinMux)
@@ -82,29 +82,29 @@ auto-generated by [[pinouts.py]]
     function_names = {'EINT': 'External Interrupt',
                       'FB': 'MC68k FlexBus',
                       'IIS': 'I2S Audio',
-                      'JTAG1': 'JTAG (same as JTAG2, JTAG_SEL=LOW)',
-                      'JTAG2': 'JTAG (same as JTAG1, JTAG_SEL=HIGH)',
+                      'JTAG0': 'JTAG (same as JTAG1, JTAG_SEL=LOW)',
+                      'JTAG1': 'JTAG (same as JTAG0, JTAG_SEL=HIGH)',
                       'LCD': '24-pin RGB/TTL LCD',
                       'RG': 'RGMII Ethernet',
                       'MMC': 'eMMC 1/2/4/8 pin',
                       'PWM': 'PWM (pulse-width modulation)',
+                      'SD0': 'SD/MMC 0',
                       'SD1': 'SD/MMC 1',
                       'SD2': 'SD/MMC 2',
-                      'SD3': 'SD/MMC 3',
+                      'SPI0': 'SPI (Serial Peripheral Interface) 0',
                       'SPI1': 'SPI (Serial Peripheral Interface) 1',
-                      'SPI2': 'SPI (Serial Peripheral Interface) 2',
                       'QSPI': 'Quad SPI (Serial Peripheral Interface) 1',
+                      'TWI0': 'I2C 0',
                       'TWI1': 'I2C 1',
                       'TWI2': 'I2C 2',
-                      'TWI3': 'I2C 3',
                       'UARTQ0': 'UART (TX/RX/CTS/RTS) 0',
                       'UARTQ1': 'UART (TX/RX/CTS/RTS) 1',
+                      'UART0': 'UART (TX/RX) 0',
+                      'UART1': 'UART (TX/RX) 1',
                       'UART2': 'UART (TX/RX) 2',
-                      'UART3': 'UART (TX/RX) 3',
-                      'UART4': 'UART (TX/RX) 4',
+                      'ULPI0': 'ULPI (USB Low Pin-count) 0',
                       'ULPI1': 'ULPI (USB Low Pin-count) 1',
                       'ULPI2': 'ULPI (USB Low Pin-count) 2',
-                      'ULPI3': 'ULPI (USB Low Pin-count) 3',
                       }
 
     fns = display_fns(bankspec, pinouts, function_names)
@@ -117,22 +117,21 @@ auto-generated by [[pinouts.py]]
     # using "BM:Name".  Pins are removed in-order as listed from
     # lists (interfaces, EINTs, PWMs) from available pins.
 
-    minitest = ['B1:LCD/22', 'ULPI1/8', 'ULPI2', 'MMC', 'SD1', 'UART3',
-              'TWI3', 'SPI2', 'E2:SD2', ]
-    minitest_eint = ['EINT_0', 'EINT_1', 'EINT_2', 'EINT_3']
-    minitest_pwm = ['D1:PWM_2']
+    minitest = ['ULPI0/8', 'ULPI1', 'MMC', 'SD0', 'UART0',
+              'TWI0', 'SPI0', 'B3:SD1', ]
+    minitest_eint = ['EINT_0', 'EINT_1', 'EINT_2', 'EINT_3', 'EINT_4']
+    minitest_pwm = ['B2:PWM_0']
     descriptions = {
         'MMC': 'internal (on Card)',
-        'SD1': 'user-facing: internal (on Card), multiplexed with JTAG1\n'
+        'SD0': 'user-facing: internal (on Card), multiplexed with JTAG1\n'
         'and UART2, for debug purposes',
-        'TWI3': 'EOMA68-compliance: must be entirely free of devices.\n'
-        'Address 0x51 used (externally) for EOMA68 EEPROM Id',
-        'E2:SD2': 'EOMA68-compliance',
-        'SPI2': 'EOMA68-compliance',
-        'UART3': 'EOMA68-compliance',
-        'B1:LCD/22': 'EOMA68-compliance, 18-bit RGB/TTL LCD',
-        'ULPI1/8': 'user-facing: internal (on Card), USB-OTG ULPI PHY',
-        'ULPI2': 'EOMA68-compliance: dual USB2 Host ULPI PHY'
+        'TWI2': 'I2C.\n',
+        'E2:SD1': '',
+        'SPI1': '',
+        'UART0': '',
+        'B1:LCD/22': '18-bit RGB/TTL LCD',
+        'ULPI0/8': 'user-facing: internal (on Card), USB-OTG ULPI PHY',
+        'ULPI1': 'dual USB2 Host ULPI PHY'
     }
 
     unused_pins = check_functions("MiniTest", bankspec, fns, pinouts,