Skip to content

Commit eea739b

Browse files
glaserfglaserf
committed
[sw] Adapt all references to previously _aon/Aon suffixed objects
This commit touches a large part of the device software, but only drops the Aon IP suffix in various forms. Signed-off-by: Florian Glaser <glaserf@lowrisc.org>
1 parent 0debbf8 commit eea739b

205 files changed

Lines changed: 585 additions & 611 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎sw/device/examples/hello_usbdev/hello_usbdev.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ void configure_pinmux(void) {
140140

141141
void _ottf_main(void) {
142142
CHECK_DIF_OK(dif_pinmux_init(
143-
mmio_region_from_addr(TOP_EARLGREY_PINMUX_AON_BASE_ADDR), &pinmux));
143+
mmio_region_from_addr(TOP_EARLGREY_PINMUX_BASE_ADDR), &pinmux));
144144
configure_pinmux();
145145

146146
CHECK_DIF_OK(dif_uart_init(

‎sw/device/examples/hello_world/hello_world.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void configure_pinmux(void) {
5252

5353
void _ottf_main(void) {
5454
CHECK_DIF_OK(dif_pinmux_init(
55-
mmio_region_from_addr(TOP_EARLGREY_PINMUX_AON_BASE_ADDR), &pinmux));
55+
mmio_region_from_addr(TOP_EARLGREY_PINMUX_BASE_ADDR), &pinmux));
5656
configure_pinmux();
5757

5858
CHECK_DIF_OK(dif_uart_init(

‎sw/device/examples/sram_program/sram_program.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ bool test_main(void) {
2828
if (kDeviceType != kDeviceSimDV) {
2929
// Configure the pinmux.
3030
CHECK_DIF_OK(dif_pinmux_init(
31-
mmio_region_from_addr(TOP_EARLGREY_PINMUX_AON_BASE_ADDR), &pinmux));
31+
mmio_region_from_addr(TOP_EARLGREY_PINMUX_BASE_ADDR), &pinmux));
3232
pinmux_testutils_init(&pinmux);
3333

3434
// Initialize UART.

‎sw/device/examples/teacup_demos/teacup_leds_and_screen_demo.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ static status_t peripheral_init(void) {
105105
// Initialize DIFs.
106106
TRY(dif_i2c_init(mmio_region_from_addr(TOP_EARLGREY_I2C0_BASE_ADDR), &i2c));
107107
TRY(dif_gpio_init(mmio_region_from_addr(TOP_EARLGREY_GPIO_BASE_ADDR), &gpio));
108-
TRY(dif_pinmux_init(mmio_region_from_addr(TOP_EARLGREY_PINMUX_AON_BASE_ADDR),
108+
TRY(dif_pinmux_init(mmio_region_from_addr(TOP_EARLGREY_PINMUX_BASE_ADDR),
109109
&pinmux));
110110
TRY(dif_spi_host_init(mmio_region_from_addr(TOP_EARLGREY_SPI_HOST1_BASE_ADDR),
111111
&spi_host));

‎sw/device/examples/teacup_demos/teacup_leds_demo.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ static const led_rgb_color_t kLedColorGreen = {
5959
static status_t peripheral_init(void) {
6060
// Initialize DIFs.
6161
TRY(dif_i2c_init(mmio_region_from_addr(TOP_EARLGREY_I2C0_BASE_ADDR), &i2c));
62-
TRY(dif_pinmux_init(mmio_region_from_addr(TOP_EARLGREY_PINMUX_AON_BASE_ADDR),
62+
TRY(dif_pinmux_init(mmio_region_from_addr(TOP_EARLGREY_PINMUX_BASE_ADDR),
6363
&pinmux));
6464

6565
// Initialize pinmux.

‎sw/device/lib/crypto/drivers/alert.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
uint32_t read_alert_registers(void) {
1818
mmio_region_t sensor_ctrl =
19-
mmio_region_from_addr(TOP_EARLGREY_SENSOR_CTRL_AON_BASE_ADDR);
19+
mmio_region_from_addr(TOP_EARLGREY_SENSOR_CTRL_BASE_ADDR);
2020
mmio_region_t alert_handler =
2121
mmio_region_from_addr(TOP_EARLGREY_ALERT_HANDLER_BASE_ADDR);
2222

@@ -78,7 +78,7 @@ status_t clear_alert_class_accum(void) {
7878

7979
status_t init_alert_registers(void) {
8080
mmio_region_t sensor_ctrl =
81-
mmio_region_from_addr(TOP_EARLGREY_SENSOR_CTRL_AON_BASE_ADDR);
81+
mmio_region_from_addr(TOP_EARLGREY_SENSOR_CTRL_BASE_ADDR);
8282
mmio_region_t alert_handler =
8383
mmio_region_from_addr(TOP_EARLGREY_ALERT_HANDLER_BASE_ADDR);
8484

‎sw/device/lib/crypto/impl/config.c‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ otcrypto_status_t otcrypto_security_config_check(
2020
otcrypto_key_security_level_t security_level) {
2121
if (launder32(security_level) != kOtcryptoKeySecurityLevelLow) {
2222
// Check if the jittery clock is enabled.
23-
mmio_region_t clkmgr =
24-
mmio_region_from_addr(TOP_EARLGREY_CLKMGR_AON_BASE_ADDR);
23+
mmio_region_t clkmgr = mmio_region_from_addr(TOP_EARLGREY_CLKMGR_BASE_ADDR);
2524
uint32_t jittery_clk_en =
2625
mmio_region_read32(clkmgr, CLKMGR_JITTER_ENABLE_REG_OFFSET);
2726
if (launder32(jittery_clk_en) != kMultiBitBool4True) {
@@ -48,7 +47,7 @@ otcrypto_status_t otcrypto_set_security_config(
4847
if (launder32(security_level) != kOtcryptoKeySecurityLevelLow) {
4948
// Enable the jittery clock.
5049
abs_mmio_write32(
51-
TOP_EARLGREY_CLKMGR_AON_BASE_ADDR + CLKMGR_JITTER_ENABLE_REG_OFFSET,
50+
TOP_EARLGREY_CLKMGR_BASE_ADDR + CLKMGR_JITTER_ENABLE_REG_OFFSET,
5251
kMultiBitBool4True);
5352

5453
// Enable the dummy instructions and the data independent timing in ibex.

‎sw/device/lib/dif/dif_pwrmgr.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ typedef struct dif_pwrmgr_wakeup_reason {
182182
* CHECK_DIF_OK(dif_pwrmgr_find_request_source(
183183
* pwrmgr,
184184
* kDifPwrmgrReqTypeWakeup,
185-
* dt_aon_timer_instance_id(kDtAonTimerAon),
185+
* dt_aon_timer_instance_id(kDtAonTimer),
186186
* kDtAonTimerWakeupWkupReq,
187187
* &wakeup_sources));
188188
* ```

‎sw/device/lib/dif/dif_pwrmgr_unittest.cc‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -637,27 +637,27 @@ TEST_F(WakeupRecording, GetReason) {
637637
.value = 1,
638638
},
639639
{
640-
.offset = PWRMGR_PARAM_SYSRST_CTRL_AON_WKUP_REQ_IDX,
640+
.offset = PWRMGR_PARAM_SYSRST_CTRL_WKUP_REQ_IDX,
641641
.value = 1,
642642
},
643643
{
644-
.offset = PWRMGR_PARAM_ADC_CTRL_AON_WKUP_REQ_IDX,
644+
.offset = PWRMGR_PARAM_ADC_CTRL_WKUP_REQ_IDX,
645645
.value = 1,
646646
},
647647
{
648-
.offset = PWRMGR_PARAM_PINMUX_AON_PIN_WKUP_REQ_IDX,
648+
.offset = PWRMGR_PARAM_PINMUX_PIN_WKUP_REQ_IDX,
649649
.value = 1,
650650
},
651651
{
652-
.offset = PWRMGR_PARAM_PINMUX_AON_USB_WKUP_REQ_IDX,
652+
.offset = PWRMGR_PARAM_PINMUX_USB_WKUP_REQ_IDX,
653653
.value = 1,
654654
},
655655
{
656-
.offset = PWRMGR_PARAM_AON_TIMER_AON_WKUP_REQ_IDX,
656+
.offset = PWRMGR_PARAM_AON_TIMER_WKUP_REQ_IDX,
657657
.value = 1,
658658
},
659659
{
660-
.offset = PWRMGR_PARAM_SENSOR_CTRL_AON_WKUP_REQ_IDX,
660+
.offset = PWRMGR_PARAM_SENSOR_CTRL_WKUP_REQ_IDX,
661661
.value = 1,
662662
}},
663663
.exp_output = {.types = kDifPwrmgrWakeupTypeAbort |
@@ -697,7 +697,7 @@ TEST_F(WakeupRecording, GetReason) {
697697
// Only requests from peripherals.
698698
{
699699
.read_val = {{
700-
.offset = PWRMGR_PARAM_SYSRST_CTRL_AON_WKUP_REQ_IDX,
700+
.offset = PWRMGR_PARAM_SYSRST_CTRL_WKUP_REQ_IDX,
701701
.value = 1,
702702
}},
703703
.exp_output =
@@ -708,7 +708,7 @@ TEST_F(WakeupRecording, GetReason) {
708708
},
709709
{
710710
.read_val = {{
711-
.offset = PWRMGR_PARAM_ADC_CTRL_AON_WKUP_REQ_IDX,
711+
.offset = PWRMGR_PARAM_ADC_CTRL_WKUP_REQ_IDX,
712712
.value = 1,
713713
}},
714714
.exp_output =
@@ -719,7 +719,7 @@ TEST_F(WakeupRecording, GetReason) {
719719
},
720720
{
721721
.read_val = {{
722-
.offset = PWRMGR_PARAM_PINMUX_AON_PIN_WKUP_REQ_IDX,
722+
.offset = PWRMGR_PARAM_PINMUX_PIN_WKUP_REQ_IDX,
723723
.value = 1,
724724
}},
725725
.exp_output =
@@ -730,7 +730,7 @@ TEST_F(WakeupRecording, GetReason) {
730730
},
731731
{
732732
.read_val = {{
733-
.offset = PWRMGR_PARAM_PINMUX_AON_USB_WKUP_REQ_IDX,
733+
.offset = PWRMGR_PARAM_PINMUX_USB_WKUP_REQ_IDX,
734734
.value = 1,
735735
}},
736736
.exp_output =
@@ -741,7 +741,7 @@ TEST_F(WakeupRecording, GetReason) {
741741
},
742742
{
743743
.read_val = {{
744-
.offset = PWRMGR_PARAM_AON_TIMER_AON_WKUP_REQ_IDX,
744+
.offset = PWRMGR_PARAM_AON_TIMER_WKUP_REQ_IDX,
745745
.value = 1,
746746
}},
747747
.exp_output =
@@ -752,7 +752,7 @@ TEST_F(WakeupRecording, GetReason) {
752752
},
753753
{
754754
.read_val = {{
755-
.offset = PWRMGR_PARAM_SENSOR_CTRL_AON_WKUP_REQ_IDX,
755+
.offset = PWRMGR_PARAM_SENSOR_CTRL_WKUP_REQ_IDX,
756756
.value = 1,
757757
}},
758758
.exp_output =

‎sw/device/lib/testing/aon_timer_testutils.c‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ status_t aon_timer_testutils_get_aon_cycles_32_from_us(uint64_t microseconds,
2121
uint32_t *cycles) {
2222
uint64_t cycles_ =
2323
udiv64_slow(microseconds * dt_clock_frequency(dt_aon_timer_clock(
24-
kDtAonTimerAon, kDtAonTimerClockAon)),
24+
kDtAonTimer, kDtAonTimerClockAon)),
2525
1000000,
2626
/*rem_out=*/NULL);
2727
TRY_CHECK(cycles_ <= UINT32_MAX,
@@ -33,20 +33,19 @@ status_t aon_timer_testutils_get_aon_cycles_32_from_us(uint64_t microseconds,
3333

3434
status_t aon_timer_testutils_get_aon_cycles_64_from_us(uint64_t microseconds,
3535
uint64_t *cycles) {
36-
*cycles =
37-
udiv64_slow(microseconds * dt_clock_frequency(dt_aon_timer_clock(
38-
kDtAonTimerAon, kDtAonTimerClockAon)),
39-
1000000,
40-
/*rem_out=*/NULL);
36+
*cycles = udiv64_slow(microseconds * dt_clock_frequency(dt_aon_timer_clock(
37+
kDtAonTimer, kDtAonTimerClockAon)),
38+
1000000,
39+
/*rem_out=*/NULL);
4140
return OK_STATUS();
4241
}
4342

4443
status_t aon_timer_testutils_get_us_from_aon_cycles(uint64_t cycles,
4544
uint32_t *us) {
46-
uint64_t uss = udiv64_slow(cycles * 1000000,
47-
dt_clock_frequency(dt_aon_timer_clock(
48-
kDtAonTimerAon, kDtAonTimerClockAon)),
49-
/*rem_out=*/NULL);
45+
uint64_t uss = udiv64_slow(
46+
cycles * 1000000,
47+
dt_clock_frequency(dt_aon_timer_clock(kDtAonTimer, kDtAonTimerClockAon)),
48+
/*rem_out=*/NULL);
5049
TRY_CHECK(uss <= UINT32_MAX,
5150
"The value 0x%08x%08x can't fit into the 32 bits timer counter.",
5251
(uint32_t)(uss >> 32), (uint32_t)uss);

0 commit comments

Comments
 (0)