Skip to content

Commit 06fe280

Browse files
committed
[hw,darjeeling] Remove references to the ADC clock
Signed-off-by: Robert Schilling <[email protected]>
1 parent 91bddb1 commit 06fe280

26 files changed

+6
-587
lines changed

hw/top_darjeeling/data/autogen/top_darjeeling.gen.hjson

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@
123123
clocks:
124124
{
125125
clk_io_peri: io
126-
clk_aon_peri: aon
127126
}
128127
}
129128
{
@@ -3562,11 +3561,6 @@
35623561
clock: io
35633562
group: infra
35643563
}
3565-
clk_ast_adc_i:
3566-
{
3567-
clock: aon
3568-
group: peri
3569-
}
35703564
clk_ast_alert_i:
35713565
{
35723566
clock: io
@@ -3586,11 +3580,6 @@
35863580
name: lc_io
35873581
domain: "0"
35883582
}
3589-
rst_ast_adc_ni:
3590-
{
3591-
name: lc_aon
3592-
domain: Aon
3593-
}
35943583
rst_ast_alert_ni:
35953584
{
35963585
name: lc_io
@@ -3611,7 +3600,6 @@
36113600
clock_connections:
36123601
{
36133602
clk_ast_tlul_i: clkmgr_aon_clocks.clk_io_infra
3614-
clk_ast_adc_i: clkmgr_aon_clocks.clk_aon_peri
36153603
clk_ast_alert_i: clkmgr_aon_clocks.clk_io_secure
36163604
clk_ast_rng_i: clkmgr_aon_clocks.clk_main_secure
36173605
}
@@ -20650,7 +20638,6 @@
2065020638
clocks:
2065120639
{
2065220640
clk_io_peri: io
20653-
clk_aon_peri: aon
2065420641
}
2065520642
}
2065620643
clock_connection: clkmgr_aon_clocks.clk_io_peri
@@ -20673,7 +20660,6 @@
2067320660
clocks:
2067420661
{
2067520662
clk_io_peri: io
20676-
clk_aon_peri: aon
2067720663
}
2067820664
}
2067920665
clock_connection: clkmgr_aon_clocks.clk_io_peri
@@ -20696,7 +20682,6 @@
2069620682
clocks:
2069720683
{
2069820684
clk_io_peri: io
20699-
clk_aon_peri: aon
2070020685
}
2070120686
}
2070220687
clock_connection: clkmgr_aon_clocks.clk_io_peri
@@ -20765,7 +20750,6 @@
2076520750
clocks:
2076620751
{
2076720752
clk_io_peri: io
20768-
clk_aon_peri: aon
2076920753
}
2077020754
}
2077120755
clock_connection: clkmgr_aon_clocks.clk_io_peri

hw/top_darjeeling/data/chip_conn_testplan.hjson

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
"ast_clk_io_out",
3737
"ast_all_byp_ack_out",
3838
"ast_io_byp_ack_out",
39-
"ast_clk_adc_in",
4039
"ast_clk_alert_in",
4140
"ast_clk_es_in",
4241
"ast_clk_rng_in",
@@ -73,8 +72,7 @@
7372
desc: '''Verify the reset connectivity between AST and reset manager.
7473
'''
7574
stage: V2
76-
tests: ["ast_rst_adc_in",
77-
"ast_rst_alert_in",
75+
tests: ["ast_rst_alert_in",
7876
"ast_rst_es_in",
7977
"ast_rst_rng_in",
8078
"ast_rst_tlul_in",
@@ -380,15 +378,13 @@
380378
name: clkmgr_clk_io_peri
381379
desc: '''Verify clkmgr's `clk_io_peri` is connected to the following blocks' clock
382380
input:
383-
- adc_ctrl clk_i
384381
- gpio clk_i
385382
- spi_device clk_i
386383
- i2c0 clk_i
387384
- uart0 clk_i
388385
'''
389386
stage: V2
390-
tests: ["clkmgr_peri_clk_adc_ctrl_aon_clk",
391-
"clkmgr_peri_clk_gpio_clk",
387+
tests: ["clkmgr_peri_clk_gpio_clk",
392388
"clkmgr_peri_clk_spi_device_clk",
393389
"clkmgr_peri_clk_i2c0_clk",
394390
"clkmgr_peri_clk_uart0_clk"]
@@ -949,17 +945,6 @@
949945
tests: ["rstmgr_spi_host0_d0_spi_host0_rst_ni"]
950946
tags: ["conn"]
951947
}
952-
{
953-
name: rst_sys_aon_aon
954-
desc: '''Verify rstmgr's rst_sys_aon_n[0] is connected to the following:
955-
- adc_ctrl's rst_aon_ni
956-
- sensor_ctrl's rst_aon_ni
957-
'''
958-
stage: V2
959-
tests: ["rstmgr_sys_aon_aon_adc_ctrl_rst_aon_ni",
960-
"rstmgr_sys_aon_aon_sensor_ctrl_rst_aon_ni"]
961-
tags: ["conn"]
962-
}
963948
{
964949
name: rst_sys_io_d0
965950
desc: '''Verify rstmgr's rst_sys_io_n[1] is connected to xbar_main's rst_spi_host0_ni.'''
@@ -970,13 +955,11 @@
970955
{
971956
name: rst_sys_io_aon
972957
desc: '''Verify rstmgr's rst_sys_io_n[0] is connected to the following:
973-
- adc_ctrl's rst_ni
974958
- sensor_ctrl's rst_ni
975959
- sram_ctrl_ret's rst_ni
976960
'''
977961
stage: V2
978-
tests: ["rstmgr_sys_io_aon_adc_ctrl_rst_ni",
979-
"rstmgr_sys_io_aon_sensor_ctrl_rst_ni",
962+
tests: ["rstmgr_sys_io_aon_sensor_ctrl_rst_ni",
980963
"rstmgr_sys_io_aon_sram_ctrl_ret_rst_ni"]
981964
tags: ["conn"]
982965
}

hw/top_darjeeling/data/chip_testplan.hjson

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,11 +2438,10 @@
24382438
desc: '''Verify the clk and rst inputs to AST (from `clkmgr`).
24392439

24402440
Create different scenarios that affect the clocks and resets and see that the AST features
2441-
(RNG, entropy, alert, ADC) that use those clocks/resets behave correctly.
2441+
(RNG, entropy, alert) that use those clocks/resets behave correctly.
24422442
sequence:
24432443
1. Check that AST RNG generates data and fills the entropy source fifo
24442444
2. Create AST alerts
2445-
3. Activate ADC conversion
24462445
4. EDN entropy supply to AST
24472446
Enter sleep/deep sleep/ stop IO clocks
24482447
Repeat 1-4 to check it is ok.
@@ -2930,7 +2929,6 @@
29302929

29312930
Blocks / functionality to run simultaneously in this test:
29322931

2933-
- The ADC is continuously sampling new data
29342932
- Staggered activation of OTBN, aes, KMAC/HMAC.
29352933
- KMAC / aes would need to take turns being fed data
29362934
- KMAC activation should be a combination of otp background, key

hw/top_darjeeling/data/top_darjeeling.hjson

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -553,10 +553,6 @@
553553
clock: "io",
554554
group: "infra"
555555
},
556-
clk_ast_adc_i: {
557-
clock: "aon",
558-
group: "peri"
559-
},
560556
clk_ast_alert_i: {
561557
clock: "io",
562558
group: "secure"
@@ -572,10 +568,6 @@
572568
name: "lc_io",
573569
domain: "0",
574570
}
575-
rst_ast_adc_ni: {
576-
name: "lc_aon",
577-
domain: "Aon"
578-
},
579571
rst_ast_alert_ni: {
580572
name: "lc_io",
581573
domain: "0",

hw/top_darjeeling/dv/env/chip_env.core

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,6 @@ filesets:
126126
- seq_lib/chip_sw_rom_e2e_jtag_debug_vseq.sv: {is_include_file: true}
127127
- seq_lib/chip_sw_rom_e2e_jtag_inject_vseq.sv: {is_include_file: true}
128128
- seq_lib/chip_sw_power_virus_vseq.sv: {is_include_file: true}
129-
- seq_lib/chip_sw_ast_clk_rst_inputs_vseq.sv: {is_include_file: true}
130129
- seq_lib/chip_sw_dma_spi_hw_handshake_vseq.sv: {is_include_file: true}
131130
- autogen/chip_env_pkg__params.sv: {is_include_file: true}
132131
- alerts_if.sv

hw/top_darjeeling/dv/env/chip_if.sv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,6 @@ interface chip_if;
536536
wire sram_ret_init_done = `SRAM_CTRL_RET_HIER.u_reg_regs.status_init_done_qs;
537537
wire sram_mbox_init_done = `SRAM_CTRL_MBOX.u_reg_regs.status_init_done_qs;
538538
`endif
539-
wire adc_data_valid = `AST_HIER.u_adc.adc_d_val_o;
540539

541540
// alert_esc_if alert_if[NUM_ALERTS](.clk (`ALERT_HANDLER_HIER.clk_i),
542541
// .rst_n(`ALERT_HANDLER_HIER.rst_ni));

hw/top_darjeeling/dv/env/seq_lib/chip_sw_ast_clk_rst_inputs_vseq.sv

Lines changed: 0 additions & 182 deletions
This file was deleted.

hw/top_darjeeling/dv/env/seq_lib/chip_vseq_list.sv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,5 @@
8585
`include "chip_sw_rom_e2e_asm_init_vseq.sv"
8686
`include "chip_sw_rom_e2e_jtag_debug_vseq.sv"
8787
`include "chip_sw_rom_e2e_jtag_inject_vseq.sv"
88-
`include "chip_sw_ast_clk_rst_inputs_vseq.sv"
8988
`include "chip_sw_power_virus_vseq.sv"
9089
`include "chip_sw_dma_spi_hw_handshake_vseq.sv"

hw/top_darjeeling/formal/conn_csvs/ast_clkmgr.csv

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ CONNECTION, AST_IO_BYP_ACK_OUT, u_ast, io_clk_byp_ack_o, top_darjeeling.u_clkm
2020
#################################
2121
# Signals from Clkmgr to AST
2222
#################################
23-
CONNECTION, AST_CLK_ADC_IN, top_darjeeling.u_clkmgr_aon, clocks_o.clk_aon_peri, u_ast, clk_ast_adc_i
2423
CONNECTION, AST_CLK_ALERT_IN, top_darjeeling.u_clkmgr_aon, clocks_o.clk_io_secure, u_ast, clk_ast_alert_i
2524
CONNECTION, AST_CLK_ES_IN, top_darjeeling.u_clkmgr_aon, clocks_o.clk_main_secure, u_ast, clk_ast_es_i
2625
CONNECTION, AST_CLK_RNG_IN, top_darjeeling.u_clkmgr_aon, clocks_o.clk_main_secure, u_ast, clk_ast_rng_i

0 commit comments

Comments
 (0)