Skip to content

Commit c7a0ce1

Browse files
Razer6a-will
Razer6
authored and
a-will
committed
[hw,gpio] Fix references to non-ipgen GPIO
Signed-off-by: Robert Schilling <[email protected]>
1 parent 2a6b3cc commit c7a0ce1

22 files changed

+62
-45
lines changed

‎BLOCKFILE‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ hw/ip/aon_timer/rtl/*
4242
hw/ip/csrng/rtl/*
4343
hw/ip/edn/rtl/*
4444
hw/ip/entropy_src/rtl/*
45-
hw/ip/gpio/rtl/*
4645
hw/ip/hmac/rtl/*
4746
hw/ip/i2c/rtl/*
4847
hw/ip/keymgr/rtl/*
@@ -86,7 +85,6 @@ hw/ip/hmac/data/hmac.hjson
8685
hw/ip/rv_dm/data/rv_dm.hjson
8786
hw/ip/kmac/data/kmac.hjson
8887
hw/ip/sysrst_ctrl/data/sysrst_ctrl.hjson
89-
hw/ip/gpio/data/gpio.hjson
9088
hw/ip/otbn/data/otbn.hjson
9189
hw/ip/entropy_src/data/entropy_src.hjson
9290
hw/ip/aes/data/aes.hjson
@@ -118,6 +116,7 @@ hw/top_earlgrey/ip_autogen/pinmux/data/pinmux.hjson
118116
hw/top_earlgrey/ip_autogen/pwrmgr/data/pwrmgr.hjson
119117
hw/top_earlgrey/ip_autogen/rstmgr/data/rstmgr.hjson
120118
hw/top_earlgrey/ip_autogen/rv_plic/data/rv_plic.hjson
119+
hw/top_earlgrey/ip_autogen/gpio/rtl/gpio.hjson
121120

122121
hw/top_earlgrey/data/top_earlgrey.hjson
123122
hw/top_earlgrey/data/xbar_main.hjson

‎SUMMARY.md‎

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,15 @@
5757
- [Registers](./hw/top_earlgrey/ip_autogen/otp_ctrl/doc/registers.md)
5858
- [Device Interface Functions](./sw/device/lib/dif/dif_otp_ctrl.h)
5959
- [Checklist](./hw/top_earlgrey/ip_autogen/otp_ctrl/doc/checklist.md)
60+
- [GPIO](./hw/top_earlgrey/ip_autogen/gpio/README.md)
61+
- [Theory of Operation](./hw/top_earlgrey/ip_autogen/gpio/doc/theory_of_operation.md)
62+
- [Design Verification](./hw/top_earlgrey/ip_autogen/gpio/dv/README.md)
63+
- [Testplan](./hw/top_earlgrey/ip_autogen/gpio/data/gpio_testplan.hjson)
64+
- [Programmer's Guide](./hw/top_earlgrey/ip_autogen/gpio/doc/programmers_guide.md)
65+
- [Hardware Interfaces](./hw/top_earlgrey/ip_autogen/gpio/doc/interfaces.md)
66+
- [Registers](./hw/top_earlgrey/ip_autogen/gpio/doc/registers.md)
67+
- [Device Interface Functions](./sw/device/lib/dif/dif_gpio.h)
68+
- [Checklist](./hw/top_earlgrey/ip_autogen/gpio/doc/checklist.md)
6069
- [Sensor Control](./hw/top_earlgrey/ip/sensor_ctrl/README.md)
6170
- [Theory of Operation](./hw/top_earlgrey/ip/sensor_ctrl/doc/theory_of_operation.md)
6271
- [Programmer's Guide](./hw/top_earlgrey/ip/sensor_ctrl/doc/programmers_guide.md)
@@ -88,6 +97,15 @@
8897
- [Registers](./hw/top_darjeeling/ip_autogen/otp_ctrl/doc/registers.md)
8998
- [Device Interface Functions](./sw/device/lib/dif/dif_otp_ctrl.h)
9099
- [Checklist](./hw/top_darjeeling/ip_autogen/otp_ctrl/doc/checklist.md)
100+
- [GPIO](./hw/top_darjeeling/ip_autogen/gpio/README.md)
101+
- [Theory of Operation](./hw/top_darjeeling/ip_autogen/gpio/doc/theory_of_operation.md)
102+
- [Design Verification](./hw/top_darjeeling/ip_autogen/gpio/dv/README.md)
103+
- [Testplan](./hw/top_darjeeling/ip_autogen/gpio/data/gpio_testplan.hjson)
104+
- [Programmer's Guide](./hw/top_darjeeling/ip_autogen/gpio/doc/programmers_guide.md)
105+
- [Hardware Interfaces](./hw/top_darjeeling/ip_autogen/gpio/doc/interfaces.md)
106+
- [Registers](./hw/top_darjeeling/ip_autogen/gpio/doc/registers.md)
107+
- [Device Interface Functions](./sw/device/lib/dif/dif_gpio.h)
108+
- [Checklist](./hw/top_darjeeling/ip_autogen/gpio/doc/checklist.md)
91109

92110
- [Cores](./hw/doc/cores.md)
93111
- [Ibex RISC-V Core Wrapper](./hw/ip/rv_core_ibex/README.md)
@@ -204,15 +222,6 @@
204222
- [Registers](./hw/top_earlgrey/ip_autogen/flash_ctrl/doc/registers.md)
205223
- [Device Interface Functions](./sw/device/lib/dif/dif_flash_ctrl.h)
206224
- [Checklist](./hw/top_earlgrey/ip_autogen/flash_ctrl/doc/checklist.md)
207-
- [GPIO](./hw/ip/gpio/README.md)
208-
- [Theory of Operation](./hw/ip/gpio/doc/theory_of_operation.md)
209-
- [Design Verification](./hw/ip/gpio/dv/README.md)
210-
- [Testplan](./hw/ip/gpio/data/gpio_testplan.hjson)
211-
- [Programmer's Guide](./hw/ip/gpio/doc/programmers_guide.md)
212-
- [Hardware Interfaces](./hw/ip/gpio/doc/interfaces.md)
213-
- [Registers](./hw/ip/gpio/doc/registers.md)
214-
- [Device Interface Functions](./sw/device/lib/dif/dif_gpio.h)
215-
- [Checklist](./hw/ip/gpio/doc/checklist.md)
216225
- [HMAC](./hw/ip/hmac/README.md)
217226
- [Theory of Operation](./hw/ip/hmac/doc/theory_of_operation.md)
218227
- [Design Verification](./hw/ip/hmac/dv/README.md)

‎hw/ip/BUILD‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ filegroup(
2020
"//hw/ip/csrng:rtl_files",
2121
"//hw/ip/edn:rtl_files",
2222
"//hw/ip/entropy_src:rtl_files",
23-
"//hw/ip/gpio:rtl_files",
2423
"//hw/ip/hmac:rtl_files",
2524
"//hw/ip/i2c:rtl_files",
2625
"//hw/ip/keymgr:rtl_files",

‎hw/ip/README.md‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
| [`dma`] | DMA Controller for the integrated OpenTitan. |
1313
| [`edn`] | Distributes random numbers produced by CSRNG to hardware blocks |
1414
| [`entropy_src`] | Filters and checks raw entropy bits from a random noise source and forwards them to CSRNG |
15-
| [`gpio`] | General-purpose I/O pin control interface for software |
1615
| [`hmac`] | Accelerator for SHA-2 256/384/512-based keyed HMAC and the hash function |
1716
| [`i2c`] | I2C interface for host and device mode, supporting up to 1 Mbaud data rates |
1817
| [`keymgr`] | Managing identities and root keys; shielding confidential assets from software; providing a key derivation interface for software |
@@ -46,7 +45,6 @@
4645
[`dma`]: ./dma/README.md
4746
[`edn`]: ./edn/README.md
4847
[`entropy_src`]: ./entropy_src/README.md
49-
[`gpio`]: ./gpio/README.md
5048
[`hmac`]: ./hmac/README.md
5149
[`i2c`]: ./i2c/README.md
5250
[`keymgr`]: ./keymgr/README.md

‎hw/top_darjeeling/dv/top_darjeeling_sim_cfgs.hjson‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
"{proj_root}/hw/ip/csrng/dv/csrng_sim_cfg.hjson",
2626
"{proj_root}/hw/ip/dma/dv/dma_sim_cfg.hjson",
2727
"{proj_root}/hw/ip/edn/dv/edn_sim_cfg.hjson",
28-
"{proj_root}/hw/ip/gpio/dv/gpio_sim_cfg.hjson",
2928
"{proj_root}/hw/ip/hmac/dv/hmac_sim_cfg.hjson",
3029
"{proj_root}/hw/ip/i2c/dv/i2c_sim_cfg.hjson",
3130
"{proj_root}/hw/ip/keymgr/dv/keymgr_sim_cfg.hjson",
@@ -52,6 +51,7 @@
5251
"{proj_root}/hw/ip/sram_ctrl/dv/sram_ctrl_ret_sim_cfg.hjson",
5352
"{proj_root}/hw/ip/uart/dv/uart_sim_cfg.hjson",
5453
// Top level IPs.
54+
"{proj_root}/hw/top_darjeeling/ip_autogen/gpio/dv/gpio_sim_cfg.hjson",
5555
"{proj_root}/hw/top_darjeeling/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson",
5656
"{proj_root}/hw/top_darjeeling/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson",
5757
"{proj_root}/hw/top_darjeeling/ip_autogen/otp_ctrl/dv/otp_ctrl_sim_cfg.hjson",

‎hw/top_darjeeling/lint/top_darjeeling_dv_lint_cfgs.hjson‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,9 @@
7474
rel_path: "hw/ip/edn/dv/lint/{tool}"
7575
},
7676
{ name: gpio
77-
fusesoc_core: lowrisc:dv:gpio_sim
77+
fusesoc_core: lowrisc:opentitan:top_darjeeling_gpio_sim
7878
import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"]
79-
rel_path: "hw/ip/gpio/dv/lint/{tool}"
79+
rel_path: "hw/top_darjeeling/ip_autogen/gpio/dv/lint/{tool}"
8080
},
8181
{ name: hmac
8282
fusesoc_core: lowrisc:dv:hmac_sim

‎hw/top_darjeeling/lint/top_darjeeling_lint_cfgs.hjson‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,6 @@
8484
import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"]
8585
rel_path: "hw/ip/edn/lint/{tool}"
8686
},
87-
{ name: gpio
88-
fusesoc_core: lowrisc:ip:gpio
89-
import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"]
90-
rel_path: "hw/ip/gpio/lint/{tool}"
91-
},
9287
{ name: hmac
9388
fusesoc_core: lowrisc:ip:hmac
9489
import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"]
@@ -190,6 +185,17 @@
190185
}
191186
]
192187
},
188+
{ name: gpio
189+
fusesoc_core: lowrisc:opentitan:top_darjeeling_gpio
190+
import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"]
191+
rel_path: "hw/top_darjeeling/ip_autogen/gpio/lint/{tool}"
192+
overrides: [
193+
{
194+
name: design_level
195+
value: "top"
196+
}
197+
]
198+
},
193199
{ name: rv_core_ibex
194200
fusesoc_core: lowrisc:ip:rv_core_ibex
195201
import_cfgs: ["{proj_root}/hw/lint/tools/dvsim/common_lint_cfg.hjson"]

‎hw/top_darjeeling/top_darjeeling.core‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ filesets:
1212
- lowrisc:opentitan:top_darjeeling_alert_handler_reg
1313
- lowrisc:opentitan:top_darjeeling_pwrmgr_pkg
1414
- lowrisc:ip:uart:0.1
15-
- lowrisc:ip:gpio
1615
- lowrisc:ip:rv_core_ibex
1716
- lowrisc:ip:rv_dm
1817
- lowrisc:ip:rv_timer
@@ -50,6 +49,7 @@ filesets:
5049
- lowrisc:opentitan:top_darjeeling_rstmgr
5150
- lowrisc:opentitan:top_darjeeling_rv_plic
5251
- lowrisc:opentitan:top_darjeeling_racl_ctrl
52+
- lowrisc:opentitan:top_darjeeling_gpio
5353
- lowrisc:ip:aon_timer
5454
- lowrisc:ip:adc_ctrl
5555
- lowrisc:ip:sysrst_ctrl

‎hw/top_earlgrey/doc/design/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ See the [UART specification](../../../ip/uart/README.md) for more details on thi
215215

216216
The chip contains one GPIO peripheral that creates 32 bits of bidirectional communication with the outside world via the pinmux.
217217
Via pinmux any of the 32 pins of GPIO can be connected to any of the 32 MIO chip pins, in any direction.
218-
See the [GPIO specification](../../../ip/gpio/README.md) for more details on this peripheral.
218+
See the [GPIO specification](../../ip_autogen/gpio/README.md) for more details on this peripheral.
219219
See the [pinmux specification](../../ip_autogen/pinmux/README.md) for how to connect peripheral IO to chip IO.
220220

221221
##### SPI device

‎hw/top_earlgrey/dv/top_earlgrey_sim_cfgs.hjson‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
"{proj_root}/hw/ip/csrng/dv/csrng_sim_cfg.hjson",
2727
"{proj_root}/hw/ip/edn/dv/edn_sim_cfg.hjson",
2828
"{proj_root}/hw/ip/entropy_src/dv/entropy_src_sim_cfg.hjson",
29-
"{proj_root}/hw/ip/gpio/dv/gpio_sim_cfg.hjson",
3029
"{proj_root}/hw/ip/hmac/dv/hmac_sim_cfg.hjson",
3130
"{proj_root}/hw/ip/i2c/dv/i2c_sim_cfg.hjson",
3231
"{proj_root}/hw/ip/keymgr/dv/keymgr_sim_cfg.hjson",
@@ -55,6 +54,7 @@
5554
"{proj_root}/hw/ip/uart/dv/uart_sim_cfg.hjson",
5655
"{proj_root}/hw/ip/usbdev/dv/usbdev_sim_cfg.hjson",
5756
// Top level IPs.
57+
"{proj_root}/hw/top_earlgrey/ip_autogen/gpio/dv/gpio_sim_cfg.hjson",
5858
"{proj_root}/hw/top_earlgrey/ip_autogen/alert_handler/dv/alert_handler_sim_cfg.hjson",
5959
"{proj_root}/hw/top_earlgrey/ip_autogen/clkmgr/dv/clkmgr_sim_cfg.hjson",
6060
"{proj_root}/hw/top_earlgrey/ip_autogen/flash_ctrl/dv/flash_ctrl_sim_cfg.hjson",

0 commit comments

Comments
 (0)