From e723bef49adf3238f0a4af7fc49916cce621397a Mon Sep 17 00:00:00 2001
From: Florent Kermarrec <florent@enjoy-digital.fr>
Date: Wed, 22 Jul 2020 14:41:09 +0200
Subject: [PATCH] platforms/arty: add usb_uart_pmod_io (USB-UART PMOD on JA) to
 ease debug with a second UART (for UARTbone/LiteScope).

Also use pmod connector names in i2s_pmod and sdcard_pmod.
---
 litex_boards/platforms/arty.py | 42 +++++++++++++++++++++-------------
 1 file changed, 26 insertions(+), 16 deletions(-)

diff --git a/litex_boards/platforms/arty.py b/litex_boards/platforms/arty.py
index d75458f..4895439 100644
--- a/litex_boards/platforms/arty.py
+++ b/litex_boards/platforms/arty.py
@@ -145,21 +145,31 @@ _io = [
     ),
 ]
 
+_usb_uart_pmod_io = [
+    # USB-UART PMOD on JA:
+    # - https://store.digilentinc.com/pmod-usbuart-usb-to-uart-interface/
+    ("usb_uart", 0,
+        Subsignal("tx", Pins("pmoda:1")),
+        Subsignal("rx", Pins("pmoda:2")),
+        IOStandard("LVCMOS33")
+    ),
+]
+
 _i2s_pmod_io = [
     # I2S PMOD on JD:
     # - https://store.digilentinc.com/pmod-i2s2-stereo-audio-input-and-output/
-    ("i2s_rx_mclk", 0, Pins("E2"), IOStandard("LVCMOS33")),
+    ("i2s_rx_mclk", 0, Pins("pmodd:4"), IOStandard("LVCMOS33")),
     ("i2s_rx", 0,
-        Subsignal("clk", Pins("H2")),
-        Subsignal("sync", Pins("D2")),
-        Subsignal("rx", Pins("G2")),
+        Subsignal("clk", Pins("pmodd:6")),
+        Subsignal("sync", Pins("pmodd:5")),
+        Subsignal("rx", Pins("pmodd:7")),
         IOStandard("LVCMOS33"),
     ),
-    ("i2s_tx_mclk", 0, Pins("D4"), IOStandard("LVCMOS33")),
+    ("i2s_tx_mclk", 0, Pins("pmodd:0"), IOStandard("LVCMOS33")),
     ("i2s_tx", 0,
-        Subsignal("clk",Pins("F4")),
-        Subsignal("sync", Pins("D3")),
-        Subsignal("tx", Pins("F3")),
+        Subsignal("clk",Pins("pmodd:2")),
+        Subsignal("sync", Pins("pmodd:1")),
+        Subsignal("tx", Pins("pmodd:3")),
         IOStandard("LVCMOS33"),
     ),
 ]
@@ -169,18 +179,18 @@ _sdcard_pmod_io = [
     # - https://store.digilentinc.com/pmod-microsd-microsd-card-slot/
     # - https://github.com/antmicro/arty-expansion-board
     ("spisdcard", 0,
-        Subsignal("clk",  Pins("F3")),
-        Subsignal("mosi", Pins("D3"), Misc("PULLUP True")),
-        Subsignal("cs_n", Pins("D4"), Misc("PULLUP True")),
-        Subsignal("miso", Pins("F4"), Misc("PULLUP True")),
+        Subsignal("clk",  Pins("pmodd:3")),
+        Subsignal("mosi", Pins("pmodd:1"), Misc("PULLUP True")),
+        Subsignal("cs_n", Pins("pmodd:0"), Misc("PULLUP True")),
+        Subsignal("miso", Pins("pmodd:2"), Misc("PULLUP True")),
         Misc("SLEW=FAST"),
         IOStandard("LVCMOS33"),
     ),
     ("sdcard", 0,
-        Subsignal("data", Pins("F4 E2 D2 D4"), Misc("PULLUP True")),
-        Subsignal("cmd", Pins("D3"), Misc("PULLUP True")),
-        Subsignal("clk", Pins("F3")),
-        Subsignal("cd", Pins("H2")),
+        Subsignal("data", Pins("pmodd:2 pmodd:4 pmodd:5 pmodd:0"), Misc("PULLUP True")),
+        Subsignal("cmd", Pins("pmodd:1"), Misc("PULLUP True")),
+        Subsignal("clk", Pins("pmodd:3")),
+        Subsignal("cd", Pins("pmodd:6")),
         Misc("SLEW=FAST"),
         IOStandard("LVCMOS33"),
     ),