From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Thu, 22 Mar 2018 03:48:36 +0000 (+0000)
Subject: rename spi to consistent name format
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=5309b7b9abc68f6b4ace33d397c4784ed0148d74;p=pinmux.git

rename spi to consistent name format
---

diff --git a/src/interface_decl.py b/src/interface_decl.py
index 122de2d..3bc5e9b 100644
--- a/src/interface_decl.py
+++ b/src/interface_decl.py
@@ -157,10 +157,10 @@ uartinterface_decl = Interface([{'name': 'rx_{0}'},
                                 {'name': 'tx_{0}', 'action': True},
                                 ])
 
-spiinterface_decl = Interface([{'name': 'sclk_{0}', 'action': True},
-                               {'name': 'mosi_{0}', 'action': True},
-                               {'name': 'ss_{0}', 'action': True},
-                               {'name': 'miso_{0}'},
+spiinterface_decl = Interface([{'name': 'spi{0}_sclk', 'action': True},
+                               {'name': 'spi{0}_mosi', 'action': True},
+                               {'name': 'spi{0}_nss', 'action': True},
+                               {'name': 'spi{0}_miso'},
                                ])
 
 twiinterface_decl = Interface([{'name': 'sda{0}', 'outen': True},
diff --git a/src/interface_def.py b/src/interface_def.py
index e27ab68..283e6c2 100644
--- a/src/interface_def.py
+++ b/src/interface_def.py
@@ -24,16 +24,16 @@ uartinterface_def = '''
       endmethod
 '''
 spiinterface_def = '''
-      method Action sclk_{0} (Bit#(1) in);
+      method Action spi{0}_sclk (Bit#(1) in);
          wrspi{0}_sclk<=in;
       endmethod
-      method Action mosi_{0} (Bit#(1) in);
+      method Action spi{0}_mosi (Bit#(1) in);
          wrspi{0}_mosi<=in;
       endmethod
-      method Action ss_{0}   (Bit#(1) in);
-         wrspi{0}_ss<=in;
+      method Action spi{0}_nss   (Bit#(1) in);
+         wrspi{0}_nss<=in;
       endmethod
-      method Bit#(1) miso_{0}=wrspi{0}_miso;
+      method Bit#(1) spi{0}_miso=wrspi{0}_miso;
 '''
 
 twiinterface_def = '''