add jtag through pinmux

[pinmux.git] / src / spec / minitest.py

diff --git a/src/spec/minitest.py b/src/spec/minitest.py
index 4ab43c0297ad82a46d737d74b951486ea8d7d6ab..fb3901fdd7ad594a9db5b7f4275e7e61921c61cf 100644 (file)
--- a/src/spec/minitest.py
+++ b/src/spec/minitest.py
@@ -8,7 +8,7 @@ from spec.ifaceprint import display_fixed
 
 def pinspec():
     pinbanks = {
-        'B': 28,
+        'A': 28,
     }
     fixedpins = {
         'CTRL_SYS': [
@@ -33,8 +33,7 @@ def pinspec():
     function_names = {'EINT': 'External Interrupt',
                       'FB': 'MC68k FlexBus',
                       'IIS': 'I2S Audio',
-                      'JTAG0': 'JTAG (same as JTAG1, JTAG_SEL=LOW)',
-                      'JTAG1': 'JTAG (same as JTAG0, JTAG_SEL=HIGH)',
+                      'JTAG': 'JTAG (JTAG_SEL=HI/LO)',
                       'LCD': '24-pin RGB/TTL LCD',
                       'RG': 'RGMII Ethernet',
                       'MMC': 'eMMC 1/2/4/8 pin',
@@ -48,8 +47,8 @@ def pinspec():
                       'TWI0': 'I2C 0',
                       'TWI1': 'I2C 1',
                       'TWI2': 'I2C 2',
-                      'UARTQ0': 'UART (TX/RX/CTS/RTS) 0',
-                      'UARTQ1': 'UART (TX/RX/CTS/RTS) 1',
+                      'QUART0': 'UART (TX/RX/CTS/RTS) 0',
+                      'QUART1': 'UART (TX/RX/CTS/RTS) 1',
                       'UART0': 'UART (TX/RX) 0',
                       'UART1': 'UART (TX/RX) 1',
                       'UART2': 'UART (TX/RX) 2',
@@ -60,27 +59,27 @@ def pinspec():
 
     ps = PinSpec(pinbanks, fixedpins, function_names)
 
-    # Bank B, 16-47
-    ps.gpio("", ('B', 0), 0, 0, 28)
-    ps.rgbttl("", ('B', 0), 1, limit=23)
-    ps.spi("0", ('B', 10), 2)
-    ps.quadspi("", ('B', 4), 2)
-    ps.uart("0", ('B', 16), 2)
-    ps.i2c("1", ('B', 18), 2)
-    ps.pwm("", ('B', 21), 2, 0, 3)
-    ps.sdmmc("0", ('B', 22), 3)
-    ps.eint("", ('B', 0), 3, 0, 4)
-    ps.eint("", ('B', 20), 2, 4, 1)
-    ps.eint("", ('B', 23), 1, 5, 1)
-    ps.sdmmc("1", ('B', 4), 3)
-    ps.jtag("1", ('B', 10), 3)
-    ps.uartfull("0", ('B', 14), 3)
-    ps.uartfull("1", ('B', 18), 3)
-    ps.jtag("0", ('B', 24), 2)
-    ps.spi("1", ('B', 24), 1)
-    ps.i2c("0", ('B', 0), 2)
-    ps.uart("1", ('B', 2), 2)
-    ps.uart("2", ('B', 14), 2)
+    # Bank A, 0-27
+    ps.gpio("", ('A', 0), 0, 0, 28)
+    ps.rgbttl("", ('A', 0), 1, limit=23)
+    ps.spi("0", ('A', 10), 2)
+    ps.quadspi("", ('A', 4), 2)
+    ps.uart("0", ('A', 16), 2)
+    ps.i2c("1", ('A', 18), 2)
+    ps.pwm("", ('A', 21), 2, 0, 3)
+    ps.sdmmc("0", ('A', 22), 3)
+    ps.eint("", ('A', 0), 3, 0, 4)
+    ps.eint("", ('A', 20), 2, 4, 1)
+    ps.eint("", ('A', 23), 1, 5, 1)
+    ps.sdmmc("1", ('A', 4), 3)
+    ps.jtag("", ('A', 10), 3)
+    ps.uartfull("0", ('A', 14), 3)
+    ps.uartfull("1", ('A', 18), 3)
+    ps.jtag("", ('A', 24), 2)
+    ps.spi("1", ('A', 24), 1)
+    ps.i2c("0", ('A', 0), 2)
+    ps.uart("1", ('A', 2), 2)
+    ps.uart("2", ('A', 14), 2)
 
     # Scenarios below can be spec'd out as either "find first interface"
     # by name/number e.g. SPI1, or as "find in bank/mux" which must be
@@ -95,7 +94,7 @@ def pinspec():
     minitest_pwm = ['B2:PWM_0']
     descriptions = {
         'MMC': 'internal (on Card)',
-        'SD0': 'user-facing: internal (on Card), multiplexed with JTAG1\n'
+        'SD0': 'user-facing: internal (on Card), multiplexed with JTAG\n'
         'and UART2, for debug purposes',
         'TWI2': 'I2C.\n',
         'E2:SD1': '',