diff options
| author | ECP5-PCIe <65254322+ECP5-PCIe@users.noreply.github.com> | 2020-07-16 10:22:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-07-16 08:22:51 +0000 |
| commit | 19cf06052230831e6d899aa3cf71539fe746a43e (patch) | |
| tree | 6d138b34c46a822239879d31fc9d99b4e15b7a52 /nmigen_boards/resources/memory.py | |
| parent | 83d9ecdd47e6610ea71037e155a8e2fd51f9f19c (diff) | |
[breaking-change] Update SPI pin names.
The new names follow the OSHWA convention described at:
https://www.oshwa.org/a-resolution-to-redefine-spi-signal-names/
Diffstat (limited to 'nmigen_boards/resources/memory.py')
| -rw-r--r-- | nmigen_boards/resources/memory.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/nmigen_boards/resources/memory.py b/nmigen_boards/resources/memory.py index 7f45cad..160f3df 100644 --- a/nmigen_boards/resources/memory.py +++ b/nmigen_boards/resources/memory.py @@ -7,7 +7,7 @@ __all__ = [ ] -def SPIFlashResources(*args, cs, clk, mosi, miso, wp=None, hold=None, +def SPIFlashResources(*args, cs, clk, copi, cipo, wp=None, hold=None, conn=None, attrs=None): resources = [] @@ -18,8 +18,8 @@ def SPIFlashResources(*args, cs, clk, mosi, miso, wp=None, hold=None, io_all.append(Subsignal("clk", Pins(clk, dir="o", conn=conn, assert_width=1))) io_1x = list(io_all) - io_1x.append(Subsignal("mosi", Pins(mosi, dir="o", conn=conn, assert_width=1))) - io_1x.append(Subsignal("miso", Pins(miso, dir="i", conn=conn, assert_width=1))) + io_1x.append(Subsignal("copi", Pins(copi, dir="o", conn=conn, assert_width=1))) + io_1x.append(Subsignal("cipo", Pins(cipo, dir="i", conn=conn, assert_width=1))) if wp is not None and hold is not None: io_1x.append(Subsignal("wp", PinsN(wp, dir="o", conn=conn, assert_width=1))) io_1x.append(Subsignal("hold", PinsN(hold, dir="o", conn=conn, assert_width=1))) @@ -27,14 +27,14 @@ def SPIFlashResources(*args, cs, clk, mosi, miso, wp=None, hold=None, name_suffix="1x")) io_2x = list(io_all) - io_2x.append(Subsignal("dq", Pins(" ".join([mosi, miso]), dir="io", conn=conn, + io_2x.append(Subsignal("dq", Pins(" ".join([copi, cipo]), dir="io", conn=conn, assert_width=2))) resources.append(Resource.family(*args, default_name="spi_flash", ios=io_2x, name_suffix="2x")) if wp is not None and hold is not None: io_4x = list(io_all) - io_4x.append(Subsignal("dq", Pins(" ".join([mosi, miso, wp, hold]), dir="io", conn=conn, + io_4x.append(Subsignal("dq", Pins(" ".join([copi, cipo, wp, hold]), dir="io", conn=conn, assert_width=4))) resources.append(Resource.family(*args, default_name="spi_flash", ios=io_4x, name_suffix="4x")) @@ -78,8 +78,8 @@ def SDCardResources(*args, clk, cmd, dat0, dat1=None, dat2=None, dat3=None, cd=N # DAT3/CS# has a pullup and doubles as electronic card detect io_spi.append(Subsignal("cs", PinsN(dat3, dir="io", conn=conn, assert_width=1))) io_spi.append(Subsignal("clk", Pins(clk, dir="o", conn=conn, assert_width=1))) - io_spi.append(Subsignal("mosi", Pins(cmd, dir="o", conn=conn, assert_width=1))) - io_spi.append(Subsignal("miso", Pins(dat0, dir="i", conn=conn, assert_width=1))) + io_spi.append(Subsignal("copi", Pins(cmd, dir="o", conn=conn, assert_width=1))) + io_spi.append(Subsignal("cipo", Pins(dat0, dir="i", conn=conn, assert_width=1))) resources.append(Resource.family(*args, default_name="sd_card", ios=io_spi, name_suffix="spi")) |