diff options
| author | Stephen Warren <swarren@nvidia.com> | 2014-05-01 16:17:02 -0600 |
|---|---|---|
| committer | Stephen Warren <swarren@nvidia.com> | 2014-07-01 14:25:20 -0600 |
| commit | 7bca06e16b378d7923bfb26d0a5998931d8f1a84 (patch) | |
| tree | 04e0edacea8148a731382d9ca8e7fad481cdbc71 | |
| parent | 73e8e7f8c4bfbe5d9ba93b7ce373d4bed06bd068 (diff) | |
| download | tegra-pinmux-scripts-7bca06e16b378d7923bfb26d0a5998931d8f1a84.tar.gz | |
Import latest Venice2 spreadsheet
A few fixes were made to the spreadsheet, including one that removes the
need for the special-case in the import script.
Signed-off-by: Stephen Warren <swarren@nvidia.com>
| -rw-r--r-- | configs/venice2.board | 8 | ||||
| -rwxr-xr-x | csv-to-board-tegra124-xlsx.py | 4 |
2 files changed, 4 insertions, 8 deletions
diff --git a/configs/venice2.board b/configs/venice2.board index 49f8bbf..ea888e8 100644 --- a/configs/venice2.board +++ b/configs/venice2.board @@ -83,7 +83,7 @@ pins = ( ('pi3', 'spi4', None, 'none', False, False, False, False), ('pi6', None, 'in', 'none', False, True, False, False), ('pi2', None, 'out0', 'none', False, False, False, False), - ('pi5', 'rsvd2', None, 'up', True, False, False, False), + ('pi5', None, 'out1', 'none', False, False, False, False), ('pi1', None, 'in', 'none', False, True, False, False), ('pi4', None, 'out0', 'none', False, False, False, False), ('pi7', 'rsvd1', None, 'down', True, False, False, False), @@ -125,12 +125,12 @@ pins = ( ('sdmmc4_dat7_paa7', 'sdmmc4', None, 'up', False, True, False, False), ('kb_col0_pq0', None, 'in', 'none', False, True, False, False), ('kb_col1_pq1', 'rsvd2', None, 'down', True, False, False, False), - ('kb_col2_pq2', 'rsvd2', None, 'down', True, False, False, False), + ('kb_col2_pq2', None, 'in', 'up', False, True, False, False), ('kb_col3_pq3', None, 'in', 'none', False, True, False, False), ('kb_col4_pq4', 'sdmmc3', None, 'up', False, True, False, False), ('kb_col5_pq5', 'rsvd2', None, 'down', True, False, False, False), - ('kb_col6_pq6', 'rsvd2', None, 'down', True, False, False, False), - ('kb_col7_pq7', 'rsvd2', None, 'down', True, False, False, False), + ('kb_col6_pq6', None, 'in', 'up', False, True, False, False), + ('kb_col7_pq7', None, 'in', 'up', False, True, False, False), ('kb_row0_pr0', None, 'out0', 'none', False, False, False, False), ('kb_row1_pr1', None, 'in', 'none', False, True, False, False), ('kb_row10_ps2', 'uarta', None, 'none', False, True, False, False), diff --git a/csv-to-board-tegra124-xlsx.py b/csv-to-board-tegra124-xlsx.py index b40cf81..f99fda1 100755 --- a/csv-to-board-tegra124-xlsx.py +++ b/csv-to-board-tegra124-xlsx.py @@ -200,10 +200,6 @@ with open(csvfile, newline='') as fh: else: gpio_init = None - # FIXME: The spreadsheet should be fixed... - if (args.board == 'venice2') and (ball_name == 'gpio_pi5'): - pupd = 'up' - gpio_pin = soc.gpio_or_pin_by_name(ball_name) for i, func in enumerate((f0, f1, f2, f3)): if func != gpio_pin.funcs[i]: |