From: Luke Kenneth Casson Leighton <lkcl@lkcl.net>
Date: Sun, 24 Jun 2018 11:00:21 +0000 (+0100)
Subject: remove pullup and other pad characteristics as theyre handled by the GPIO mod
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f58ec04eb18dd8500bbe6962a7ecd9b6dadb770c;p=pinmux.git

remove pullup and other pad characteristics as theyre handled by the GPIO mod
---

diff --git a/src/bsv/interface_decl.py b/src/bsv/interface_decl.py
index 22dcc2a..794f86d 100644
--- a/src/bsv/interface_decl.py
+++ b/src/bsv/interface_decl.py
@@ -180,11 +180,6 @@ class Interface(object):
                 params.append('outputval:0,')
                 params.append('output_en:0,')
                 params.append('input_en:1,')
-            params += ['pullup_en:0,', 'pulldown_en:0,',
-                       'pushpull_en:0,', 'drivestrength:0,',
-                       'opendrain_en:0']
-            for param in params:
-                res += '                 %s\n' % param
             res += '      };\n'
         return '\n' + res
 
diff --git a/src/bsv/pinmux_generator.py b/src/bsv/pinmux_generator.py
index 62a3ea7..5e22cd3 100644
--- a/src/bsv/pinmux_generator.py
+++ b/src/bsv/pinmux_generator.py
@@ -49,27 +49,10 @@ package pinmux;
       Bit#(1) output_en;      // output enable from core to pad         bit0
    } FunctionType deriving(Eq,Bits,FShow);
 
-   // PadCharacteristicsType: this is the controllable characteristics
-   // of the I/O cell.  They are NOT multiplexed.  Registers are to be
-   // created which manage these characteristics
-   typedef struct{
-      Bit#(1) pullup_en;      // pullup enable from core to io_cell     bit4
-      Bit#(1) pulldown_en;    // pulldown enable from core to io_cell   bit3
-      Bit#(1) drivestrength;  // drivestrength from core to io_cell     bit2
-      Bit#(1) pushpull_en;    // pushpull enable from core to io_cell   bit1
-      Bit#(1) opendrain_en;   // opendrain enable form core to io_cell  bit0
-   } PadCharacteristicsType deriving(Eq,Bits,FShow);
-
-   // TODO: leave this in for now, needs replacing with the above
    typedef struct{
       Bit#(1) outputval;      // output from core to pad                bit7
       Bit#(1) output_en;      // output enable from core to pad         bit6
       Bit#(1) input_en;       // input enable from core to io_cell      bit5
-      Bit#(1) pullup_en;      // pullup enable from core to io_cell     bit4
-      Bit#(1) pulldown_en;    // pulldown enable from core to io_cell   bit3
-      Bit#(1) drivestrength;  // drivestrength from core to io_cell     bit2
-      Bit#(1) pushpull_en;    // pushpull enable from core to io_cell   bit1
-      Bit#(1) opendrain_en;   // opendrain enable form core to io_cell  bit0
    } GenericIOType deriving(Eq,Bits,FShow);
 
 '''