pinmux update for ls180

diff --git a/src/spec/ls180.py b/src/spec/ls180.py
index f06d80bfb9ea5bc07d48329795d35603e7a9d404..737039d3a9fab6f9fcfd5d8ce0e6d48dce05ca37 100644 (file)
--- a/src/spec/ls180.py
+++ b/src/spec/ls180.py
@@ -59,38 +59,54 @@ def pinspec():
 
     ps = PinSpec(pinbanks, fixedpins, function_names)
 
-    ps.vss("E", ('N', 0), 0, 0, 1)
-    ps.vdd("E", ('N', 1), 0, 0, 1)
-    ps.sdram1("", ('N', 2), 0, 0, 30)
-    ps.vss("I", ('N', 30), 0, 0, 1)
-    ps.vdd("I", ('N', 31), 0, 0, 1)
+    ps.vdd("E", ('S', 0), 0, 0, 1)
+    ps.vss("E", ('S', 1), 0, 0, 1)
+    ps.vdd("I", ('S', 2), 0, 5, 1)
+    ps.vss("I", ('S', 3), 0, 5, 1)
+    ps.sdram1("", ('S', 4), 0, 0, 21)
+    ps.mi2c("", ('S', 26), 0, 0, 2)
+    ps.vss("I", ('S', 28), 0, 6, 1)
+    ps.vdd("I", ('S', 29), 0, 6, 1)
+    ps.vss("E", ('S', 30), 0, 13, 1)
+    ps.vdd("E", ('S', 31), 0, 13, 1)
 
-    ps.vss("E", ('E', 0), 0, 1, 1)
-    ps.vdd("E", ('E', 1), 0, 1, 1)
-    ps.sdram2("", ('E', 2), 0, 0, 12)
-    ps.vss("I", ('E', 14), 0, 1, 1)
-    ps.vdd("I", ('E', 15), 0, 1, 1)
-    ps.gpio("", ('E', 16), 0, 8, 8)
-    ps.jtag("", ('E', 25), 0, 0, 4)
+    ps.vdd("E", ('W', 0), 0, 1, 1)
+    ps.vss("E", ('W', 1), 0, 1, 1)
+    ps.vdd("I", ('W', 2), 0, 7, 1)
+    ps.vss("I", ('W', 3), 0, 7, 1)
+    ps.sdram2("", ('W', 4), 0, 0, 12)
+    ps.sdram1("", ('W', 16), 0, 21, 9)
+    ps.uart("0", ('W', 22), 0)
+    ps.jtag("", ('W', 24), 0, 0, 4)
+    ps.vss("I", ('W', 28), 0, 14, 1)
+    ps.vdd("I", ('W', 29), 0, 14, 1)
+    ps.vss("E", ('W', 30), 0, 8, 1)
+    ps.vdd("E", ('W', 31), 0, 8, 1)
 
-    ps.vss("I", ('S', 0), 0, 2, 1)
-    ps.vdd("I", ('S', 1), 0, 2, 1)
-    ps.mi2c("", ('S', 2), 0, 0, 2)
-    ps.mspi("0", ('S', 8), 0)
-    ps.uart("0", ('S', 13), 0)
-    ps.gpio("", ('S', 15), 0, 0, 8)
-    ps.sys("", ('S', 23), 0, 0, 7) # should be 7, to do all PLL pins
-    ps.vss("I", ('S', 30), 0, 3, 1)
-    ps.vdd("I", ('S', 31), 0, 3, 1)
+    ps.vss("I", ('E', 0), 0, 2, 1)
+    ps.vdd("I", ('E', 1), 0, 2, 1)
+    ps.vdd("I", ('E', 2), 0, 10, 1)
+    ps.vss("I", ('E', 3), 0, 10, 1)
+    ps.mspi("0", ('E', 4), 0)
+    ps.gpio("", ('E', 9), 0, 0, 16)
+    ps.eint("", ('E', 25), 0, 0, 3)
+    ps.vss("I", ('E', 28), 0, 9, 1)
+    ps.vdd("I", ('E', 29), 0, 9, 1)
+    ps.vss("I", ('E', 30), 0, 3, 1)
+    ps.vdd("I", ('E', 31), 0, 3, 1)
 
-    ps.vss("E", ('W', 0), 0, 2, 1)
-    ps.vdd("E", ('W', 1), 0, 2, 1)
-    #ps.pwm("", ('W', 2), 0, 0, 2)  comment out (litex problem 25mar2021)
-    ps.eint("", ('W', 4), 0, 0, 3)
-    #ps.mspi("1", ('W', 7), 0)       comment out (litex problem 25mar2021)
-    #ps.sdmmc("0", ('W', 11), 0)     # comment out (litex problem 25mar2021)
-    ps.vss("I", ('W', 30), 0, 4, 1)
-    ps.vdd("I", ('W', 31), 0, 4, 1)
+    ps.vss("E", ('N', 0), 0, 2, 1)
+    ps.vdd("E", ('N', 1), 0, 2, 1)
+    ps.vdd("I", ('N', 2), 0, 12, 1)
+    ps.vss("I", ('N', 3), 0, 12, 1)
+    #ps.pwm("", ('N', 2), 0, 0, 2)  comment out (litex problem 25mar2021)
+    #ps.mspi("1", ('N', 7), 0)       comment out (litex problem 25mar2021)
+    #ps.sdmmc("0", ('N', 11), 0)     # comment out (litex problem 25mar2021)
+    ps.sys("", ('N', 22), 0, 0, 6) # should be 6, to do all PLL pins
+    ps.vss("I", ('N', 28), 0, 11, 1)
+    ps.vdd("I", ('N', 29), 0, 11, 1)
+    ps.vss("I", ('N', 30), 0, 4, 1)
+    ps.vdd("I", ('N', 31), 0, 4, 1)
 
     #ps.mquadspi("1", ('S', 0), 0)
 

diff --git a/src/spec/pinfunctions.py b/src/spec/pinfunctions.py
index 32f0e78c5ad805a43ab607aa676ecdc94fb52e97..d30bc03d1f9ad204a0eb200f677409db4775da65 100644 (file)
--- a/src/spec/pinfunctions.py
+++ b/src/spec/pinfunctions.py
@@ -285,11 +285,11 @@ def vdd(suffix, bank):
     return (RangePin("-"), [], None)
 
 def sys(suffix, bank):
-    return (['CLK-', 'RST-',
-             'PLLCLK-',                    # PLL ref clock input
+    return (['CLK-',                       # incoming clock (to PLL)
              'PLLSELA0-', 'PLLSELA1-',     # PLL divider-selector
              'PLLTESTOUT+',                # divided-output (for testing)
              'PLLVCOUT+',                  # PLL VCO analog out (for testing)
+             'RST-',                       # reset line
              ], [], 'CLK')
 
 # list functions by name here