[top/pads] Switch CC pins to 5V tolerant pad cells

Signed-off-by: Michael Schaffner <[email protected]>
lowRISC · Feb 26, 2024 · 9dabf3f · 9dabf3f
1 parent 300d68c
commit 9dabf3f
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson b/hw/top_earlgrey/data/autogen/top_earlgrey.gen.hjson
@@ -10629,7 +10629,7 @@
       }
       {
         name: CC1
-        type: InputStd
+        type: BidirTol
         bank: AVCC
         connection: manual
         desc: ADC input 1
@@ -10638,7 +10638,7 @@
       }
       {
         name: CC2
-        type: InputStd
+        type: BidirTol
         bank: AVCC
         connection: manual
         desc: ADC input 2

diff --git a/hw/top_earlgrey/data/top_earlgrey.hjson b/hw/top_earlgrey/data/top_earlgrey.hjson
@@ -1205,8 +1205,8 @@
       { name: 'POR_N'           , type: 'InputStd',     bank: 'VCC' , connection: 'manual', desc: 'System reset'},
       { name: 'USB_P'           , type: 'DualBidirTol', bank: 'VCC' , connection: 'manual', desc: 'USB P signal'},
       { name: 'USB_N'           , type: 'DualBidirTol', bank: 'VCC' , connection: 'manual', desc: 'USB N signal'},
-      { name: 'CC1'             , type: 'InputStd',     bank: 'AVCC', connection: 'manual', desc: 'ADC input 1', port_type: '`INOUT_AI'},
-      { name: 'CC2'             , type: 'InputStd',     bank: 'AVCC', connection: 'manual', desc: 'ADC input 2', port_type: '`INOUT_AI'},
+      { name: 'CC1'             , type: 'BidirTol',     bank: 'AVCC', connection: 'manual', desc: 'ADC input 1', port_type: '`INOUT_AI'},
+      { name: 'CC2'             , type: 'BidirTol',     bank: 'AVCC', connection: 'manual', desc: 'ADC input 2', port_type: '`INOUT_AI'},
       { name: 'FLASH_TEST_VOLT' , type: 'AnalogIn0',    bank: 'VCC' , connection: 'manual', desc: 'Flash test voltage input'},
       { name: 'FLASH_TEST_MODE0', type: 'InputStd',     bank: 'VCC' , connection: 'manual', desc: 'Flash test mode signal'},
       { name: 'FLASH_TEST_MODE1', type: 'InputStd',     bank: 'VCC' , connection: 'manual', desc: 'Flash test mode signal'},

diff --git a/hw/top_earlgrey/ip/pinmux/doc/autogen/pinout_asic.md b/hw/top_earlgrey/ip/pinmux/doc/autogen/pinout_asic.md
@@ -11,8 +11,8 @@ util/topgen.py -t hw/top_earlgrey/data/top_earlgrey.hjson -o hw/top_earlgrey/
 |      <p style="font-size:smaller">POR_N</p>       |   <p style="font-size:smaller">InputStd</p>   |  <p style="font-size:smaller">VCC</p>   |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |                <p style="font-size:smaller">System reset</p>                |
 |      <p style="font-size:smaller">USB_P</p>       | <p style="font-size:smaller">DualBidirTol</p> |  <p style="font-size:smaller">VCC</p>   |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |                <p style="font-size:smaller">USB P signal</p>                |
 |      <p style="font-size:smaller">USB_N</p>       | <p style="font-size:smaller">DualBidirTol</p> |  <p style="font-size:smaller">VCC</p>   |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |                <p style="font-size:smaller">USB N signal</p>                |
-|       <p style="font-size:smaller">CC1</p>        |   <p style="font-size:smaller">InputStd</p>   |  <p style="font-size:smaller">AVCC</p>  |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |                <p style="font-size:smaller">ADC input 1</p>                 |
-|       <p style="font-size:smaller">CC2</p>        |   <p style="font-size:smaller">InputStd</p>   |  <p style="font-size:smaller">AVCC</p>  |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |                <p style="font-size:smaller">ADC input 2</p>                 |
+|       <p style="font-size:smaller">CC1</p>        |   <p style="font-size:smaller">BidirTol</p>   |  <p style="font-size:smaller">AVCC</p>  |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |                <p style="font-size:smaller">ADC input 1</p>                 |
+|       <p style="font-size:smaller">CC2</p>        |   <p style="font-size:smaller">BidirTol</p>   |  <p style="font-size:smaller">AVCC</p>  |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |                <p style="font-size:smaller">ADC input 2</p>                 |
 | <p style="font-size:smaller">FLASH_TEST_VOLT</p>  |  <p style="font-size:smaller">AnalogIn0</p>   |  <p style="font-size:smaller">VCC</p>   |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |          <p style="font-size:smaller">Flash test voltage input</p>          |
 | <p style="font-size:smaller">FLASH_TEST_MODE0</p> |   <p style="font-size:smaller">InputStd</p>   |  <p style="font-size:smaller">VCC</p>   |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |           <p style="font-size:smaller">Flash test mode signal</p>           |
 | <p style="font-size:smaller">FLASH_TEST_MODE1</p> |   <p style="font-size:smaller">InputStd</p>   |  <p style="font-size:smaller">VCC</p>   |    <p style="font-size:smaller">manual</p>    |         <p style="font-size:smaller">-</p>          |                            <p style="font-size:smaller">- / -</p>                             |           <p style="font-size:smaller">Flash test mode signal</p>           |

diff --git a/hw/top_earlgrey/ip/pinmux/doc/autogen/targets.md b/hw/top_earlgrey/ip/pinmux/doc/autogen/targets.md
@@ -4,8 +4,8 @@ DO NOT EDIT THIS FILE DIRECTLY.
 It has been generated with the following command:
 util/topgen.py -t hw/top_earlgrey/data/top_earlgrey.hjson -o hw/top_earlgrey/
 -->
-|  Target Name  |  #IO Banks  |  #Muxed Pads  |  #Direct Pads  |  #Manual Pads  |  #Total Pads  |      Pinout / Pinmux Tables       |
-|:-------------:|:-----------:|:-------------:|:--------------:|:--------------:|:-------------:|:---------------------------------:|
-|     ASIC      |      4      |      47       |       14       |       10       |      71       | [Pinout Table](./pinout_asic.md)  |
-|     CW310     |      4      |      47       |       14       |       14       |      75       | [Pinout Table](./pinout_cw310.md) |
-|     CW340     |      4      |      47       |       14       |       13       |      74       | [Pinout Table](./pinout_cw340.md) |
+|  Target Name  |  #IO Banks  |  #Muxed Pads  |  #Direct Pads  |  #Manual Pads  |  #Total Pads  |                           Pinout / Pinmux Tables                            |
+|:-------------:|:-----------:|:-------------:|:--------------:|:--------------:|:-------------:|:---------------------------------------------------------------------------:|
+|     ASIC      |      4      |      47       |       14       |       10       |      71       | [Pinout Table](../../../top_earlgrey/ip/pinmux/doc/autogen/pinout_asic.md)  |
+|     CW310     |      4      |      47       |       14       |       14       |      75       | [Pinout Table](../../../top_earlgrey/ip/pinmux/doc/autogen/pinout_cw310.md) |
+|     CW340     |      4      |      47       |       14       |       13       |      74       | [Pinout Table](../../../top_earlgrey/ip/pinmux/doc/autogen/pinout_cw340.md) |
diff --git a/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv b/hw/top_earlgrey/rtl/autogen/chip_earlgrey_asic.sv
@@ -424,8 +424,8 @@ module chip_earlgrey_asic #(
       InputStd, // FLASH_TEST_MODE1
       InputStd, // FLASH_TEST_MODE0
       AnalogIn0, // FLASH_TEST_VOLT
-      InputStd, // CC2
-      InputStd, // CC1
+      BidirTol, // CC2
+      BidirTol, // CC1
       DualBidirTol, // USB_N
       DualBidirTol, // USB_P
       InputStd  // POR_N

diff --git a/util/topgen/gen_top_docs.py b/util/topgen/gen_top_docs.py
@@ -195,7 +195,7 @@ def gen_pinmux_docs(top, c_helper, out_path):
             stats['direct'],  # direct pads
             stats['manual'],  # manual pads
             stats['muxed'] + stats['direct'] + stats['manual'],  # total pads
-            f"[Pinout Table](./{pinout_name})"  # subtable, in same dir as the summary table
+            f"[Pinout Table](../../../top_{top['name']}/ip/pinmux/doc/autogen/{pinout_name})"  # subtable, in same dir as the summary table
         ]
         table_rows.append(row)