Skip to content

Commit f67d837

Browse files
rivos-eblotrivos-eblot
committed
[ot] hw/opentitan: ot_darjeeling, ot_earlgrey: use OT_COMMON_DEV_ID
Signed-off-by: Emmanuel Blot <eblot@rivosinc.com>
1 parent 123525a commit f67d837

File tree

2 files changed

+31
-29
lines changed

2 files changed

+31
-29
lines changed

‎hw/riscv/ot_darjeeling.c

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,8 @@ static const uint32_t ot_dj_pmp_addrs[] = {
417417
OT_DJ_SOC_GPIO_SYSBUS_IRQ(2, PLIC, (_irq_) + 2u), \
418418
OT_DJ_SOC_GPIO_ALERT(0, (_alert_)), \
419419
OT_DJ_SOC_GPIO_ALERT(1, (_alert_) + 1)), \
420-
.prop = IBEXDEVICEPROPDEFS(IBEX_DEV_STRING_PROP("ot_id", stringify(_ix_)), \
420+
.prop = IBEXDEVICEPROPDEFS(IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, \
421+
stringify(_ix_)), \
421422
IBEX_DEV_STRING_PROP("ram_as_name", _asname_))
422423

423424
#define OT_DJ_SOC_DEV_MBX_DUAL(_ix_, _addr_, _asname_, _irq_, _alert_, \
@@ -429,7 +430,8 @@ static const uint32_t ot_dj_pmp_addrs[] = {
429430
OT_DJ_SOC_GPIO_SYSBUS_IRQ(2, PLIC, (_irq_) + 2u), \
430431
OT_DJ_SOC_GPIO_ALERT(0, (_alert_)), \
431432
OT_DJ_SOC_GPIO_ALERT(1, (_alert_) + 1)), \
432-
.prop = IBEXDEVICEPROPDEFS(IBEX_DEV_STRING_PROP("ot_id", stringify(_ix_)), \
433+
.prop = IBEXDEVICEPROPDEFS(IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, \
434+
stringify(_ix_)), \
433435
IBEX_DEV_STRING_PROP("ram_as_name", _asname_))
434436

435437
#define OT_DJ_PINMUX_LINK(_type_, _name_, _tgt_, _num_) \
@@ -719,7 +721,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
719721
),
720722
.prop = IBEXDEVICEPROPDEFS(
721723
IBEX_DEV_UINT_PROP("size", 0x10000u),
722-
IBEX_DEV_STRING_PROP("ot_id", "ram")
724+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "ram")
723725
),
724726
},
725727
[OT_DJ_SOC_DEV_SRAM_MBX] = {
@@ -736,7 +738,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
736738
),
737739
.prop = IBEXDEVICEPROPDEFS(
738740
IBEX_DEV_UINT_PROP("size", 0x1000u),
739-
IBEX_DEV_STRING_PROP("ot_id", "mbx")
741+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "mbx")
740742
),
741743
},
742744
[OT_DJ_SOC_DEV_ROM0] = {
@@ -756,7 +758,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
756758
OT_DJ_SOC_DEVLINK("kmac", KMAC)
757759
),
758760
.prop = IBEXDEVICEPROPDEFS(
759-
IBEX_DEV_STRING_PROP("ot_id", "rom0"),
761+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "rom0"),
760762
IBEX_DEV_UINT_PROP("size", 0x8000u),
761763
IBEX_DEV_UINT_PROP("kmac-app", 2u),
762764
IBEX_DEV_STRING_PROP("nonce", "a7bdb05fe921615b"),
@@ -780,7 +782,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
780782
OT_DJ_SOC_DEVLINK("kmac", KMAC)
781783
),
782784
.prop = IBEXDEVICEPROPDEFS(
783-
IBEX_DEV_STRING_PROP("ot_id", "rom1"),
785+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "rom1"),
784786
IBEX_DEV_UINT_PROP("size", 0x10000u),
785787
IBEX_DEV_UINT_PROP("kmac-app", 3u),
786788
IBEX_DEV_STRING_PROP("nonce", "ed2ed45545e927f6"),
@@ -932,7 +934,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
932934
OT_DJ_SOC_GPIO_ALERT(28, 51)
933935
),
934936
.prop = IBEXDEVICEPROPDEFS(
935-
IBEX_DEV_STRING_PROP("ot_id", "0")
937+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "0")
936938
),
937939
},
938940
[OT_DJ_SOC_DEV_MBX_PCIE0] = {
@@ -1206,7 +1208,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
12061208
OT_DJ_SOC_GPIO_ALERT(0, 13)
12071209
),
12081210
.prop = IBEXDEVICEPROPDEFS(
1209-
IBEX_DEV_STRING_PROP("ot_id", "spi0"),
1211+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "spi0"),
12101212
IBEX_DEV_UINT_PROP("bus-num", 0),
12111213
IBEX_DEV_UINT_PROP("pclk", OT_DJ_PERIPHERAL_CLK_HZ)
12121214
),
@@ -1356,13 +1358,13 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
13561358
),
13571359
.prop = IBEXDEVICEPROPDEFS(
13581360
IBEX_DEV_UINT_PROP("size", 0x1000u),
1359-
IBEX_DEV_STRING_PROP("ot_id", "ret")
1361+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "ret")
13601362
),
13611363
},
13621364
[OT_DJ_SOC_DEV_VMAPPER] = {
13631365
.type = TYPE_OT_VMAPPER,
13641366
.prop = IBEXDEVICEPROPDEFS(
1365-
IBEX_DEV_STRING_PROP("ot_id", "soc"),
1367+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "soc"),
13661368
IBEX_DEV_UINT_PROP("trans_count", OT_DJ_IBEX_WRAPPER_NUM_REGIONS)
13671369
),
13681370
},

‎hw/riscv/ot_earlgrey.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
390390
OT_EG_SOC_GPIO_ALERT(0, 0)
391391
),
392392
.prop = IBEXDEVICEPROPDEFS(
393-
IBEX_DEV_STRING_PROP("ot_id", "u0"),
393+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "u0"),
394394
IBEX_DEV_UINT_PROP("pclk", OT_EG_PERIPHERAL_CLK_HZ)
395395
),
396396
},
@@ -414,7 +414,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
414414
OT_EG_SOC_GPIO_ALERT(0, 1)
415415
),
416416
.prop = IBEXDEVICEPROPDEFS(
417-
IBEX_DEV_STRING_PROP("ot_id", "u1"),
417+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "u1"),
418418
IBEX_DEV_UINT_PROP("pclk", OT_EG_PERIPHERAL_CLK_HZ)
419419
),
420420
},
@@ -438,7 +438,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
438438
OT_EG_SOC_GPIO_ALERT(0, 2)
439439
),
440440
.prop = IBEXDEVICEPROPDEFS(
441-
IBEX_DEV_STRING_PROP("ot_id", "u2"),
441+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "u2"),
442442
IBEX_DEV_UINT_PROP("pclk", OT_EG_PERIPHERAL_CLK_HZ)
443443
),
444444
},
@@ -462,7 +462,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
462462
OT_EG_SOC_GPIO_ALERT(0, 3)
463463
),
464464
.prop = IBEXDEVICEPROPDEFS(
465-
IBEX_DEV_STRING_PROP("ot_id", "u3"),
465+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "u3"),
466466
IBEX_DEV_UINT_PROP("pclk", OT_EG_PERIPHERAL_CLK_HZ)
467467
),
468468
},
@@ -532,7 +532,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
532532
{ .base = 0x40080000u }
533533
),
534534
.prop = IBEXDEVICEPROPDEFS(
535-
IBEX_DEV_STRING_PROP("ot_id", "i2c0"),
535+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "i2c0"),
536536
IBEX_DEV_UINT_PROP("size", 0x80u),
537537
IBEX_DEV_UINT_PROP("irq-count", 15u),
538538
IBEX_DEV_UINT_PROP("alert-count", 1u),
@@ -549,7 +549,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
549549
{ .base = 0x40090000u }
550550
),
551551
.prop = IBEXDEVICEPROPDEFS(
552-
IBEX_DEV_STRING_PROP("ot_id", "i2c1"),
552+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "i2c1"),
553553
IBEX_DEV_UINT_PROP("size", 0x80u),
554554
IBEX_DEV_UINT_PROP("irq-count", 15u),
555555
IBEX_DEV_UINT_PROP("alert-count", 1u),
@@ -566,7 +566,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
566566
{ .base = 0x400a0000u }
567567
),
568568
.prop = IBEXDEVICEPROPDEFS(
569-
IBEX_DEV_STRING_PROP("ot_id", "i2c2"),
569+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "i2c2"),
570570
IBEX_DEV_UINT_PROP("size", 0x80u),
571571
IBEX_DEV_UINT_PROP("irq-count", 15u),
572572
IBEX_DEV_UINT_PROP("alert-count", 1u),
@@ -583,7 +583,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
583583
{ .base = 0x400e0000u }
584584
),
585585
.prop = IBEXDEVICEPROPDEFS(
586-
IBEX_DEV_STRING_PROP("ot_id", "pattgen"),
586+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "pattgen"),
587587
IBEX_DEV_UINT_PROP("size", 0x40u),
588588
IBEX_DEV_UINT_PROP("irq-count", 2u),
589589
IBEX_DEV_UINT_PROP("alert-count", 1u),
@@ -713,7 +713,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
713713
OT_EG_SOC_GPIO_ALERT(0, 19)
714714
),
715715
.prop = IBEXDEVICEPROPDEFS(
716-
IBEX_DEV_STRING_PROP("ot_id", "spi0"),
716+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "spi0"),
717717
IBEX_DEV_UINT_PROP("bus-num", 0),
718718
IBEX_DEV_UINT_PROP("pclk", OT_EG_CORE_CLK_HZ)
719719
),
@@ -729,7 +729,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
729729
OT_EG_SOC_GPIO_ALERT(0, 20)
730730
),
731731
.prop = IBEXDEVICEPROPDEFS(
732-
IBEX_DEV_STRING_PROP("ot_id", "spi1"),
732+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "spi1"),
733733
IBEX_DEV_UINT_PROP("bus-num", 1),
734734
IBEX_DEV_UINT_PROP("pclk", OT_EG_CORE_CLK_HZ)
735735
),
@@ -741,7 +741,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
741741
{ .base = 0x40320000u }
742742
),
743743
.prop = IBEXDEVICEPROPDEFS(
744-
IBEX_DEV_STRING_PROP("ot_id", "usbdev"),
744+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "usbdev"),
745745
IBEX_DEV_UINT_PROP("size", 0x1000u),
746746
IBEX_DEV_UINT_PROP("irq-count", 18u),
747747
IBEX_DEV_UINT_PROP("alert-count", 1u),
@@ -803,7 +803,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
803803
{ .base = 0x40430000u }
804804
),
805805
.prop = IBEXDEVICEPROPDEFS(
806-
IBEX_DEV_STRING_PROP("ot_id", "sysrst_ctrl"),
806+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "sysrst_ctrl"),
807807
IBEX_DEV_UINT_PROP("size", 0x100u),
808808
IBEX_DEV_UINT_PROP("irq-count", 1u),
809809
IBEX_DEV_UINT_PROP("alert-count", 1u),
@@ -820,7 +820,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
820820
{ .base = 0x40440000u }
821821
),
822822
.prop = IBEXDEVICEPROPDEFS(
823-
IBEX_DEV_STRING_PROP("ot_id", "adc_ctrl"),
823+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "adc_ctrl"),
824824
IBEX_DEV_UINT_PROP("size", 0x80u),
825825
IBEX_DEV_UINT_PROP("irq-count", 1u),
826826
IBEX_DEV_UINT_PROP("alert-count", 1u),
@@ -837,7 +837,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
837837
{ .base = 0x40450000u }
838838
),
839839
.prop = IBEXDEVICEPROPDEFS(
840-
IBEX_DEV_STRING_PROP("ot_id", "pwm"),
840+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "pwm"),
841841
IBEX_DEV_UINT_PROP("size", 0x80u),
842842
IBEX_DEV_UINT_PROP("alert-count", 1u),
843843
IBEX_DEV_BOOL_PROP("warn-once", true)
@@ -903,7 +903,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
903903
),
904904
.prop = IBEXDEVICEPROPDEFS(
905905
IBEX_DEV_UINT_PROP("size", 0x1000u),
906-
IBEX_DEV_STRING_PROP("ot_id", "ret")
906+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "ret")
907907
),
908908
},
909909
[OT_EG_SOC_DEV_FLASH_CTRL] = {
@@ -1005,7 +1005,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
10051005
{ .base = 0x41140000u }
10061006
),
10071007
.prop = IBEXDEVICEPROPDEFS(
1008-
IBEX_DEV_STRING_PROP("ot_id", "keymgr"),
1008+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "keymgr"),
10091009
IBEX_DEV_UINT_PROP("size", 0x100u),
10101010
IBEX_DEV_UINT_PROP("irq-count", 1u),
10111011
IBEX_DEV_UINT_PROP("alert-count", 2u),
@@ -1102,7 +1102,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
11021102
),
11031103
.prop = IBEXDEVICEPROPDEFS(
11041104
IBEX_DEV_UINT_PROP("size", SRAM_MAIN_SIZE),
1105-
IBEX_DEV_STRING_PROP("ot_id", "ram")
1105+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "ram")
11061106
),
11071107
},
11081108
[OT_EG_SOC_DEV_ROM_CTRL] = {
@@ -1122,7 +1122,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
11221122
OT_EG_SOC_DEVLINK("kmac", KMAC)
11231123
),
11241124
.prop = IBEXDEVICEPROPDEFS(
1125-
IBEX_DEV_STRING_PROP("ot_id", "rom"),
1125+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "rom"),
11261126
IBEX_DEV_UINT_PROP("size", 0x8000u),
11271127
IBEX_DEV_UINT_PROP("kmac-app", 2u),
11281128
/* Earlgrey-M2.5.2-RC0 */
@@ -1202,7 +1202,7 @@ static const IbexDeviceDef ot_eg_soc_devices[] = {
12021202
[OT_EG_SOC_DEV_VMAPPER] = {
12031203
.type = TYPE_OT_VMAPPER,
12041204
.prop = IBEXDEVICEPROPDEFS(
1205-
IBEX_DEV_STRING_PROP("ot_id", "soc"),
1205+
IBEX_DEV_STRING_PROP(OT_COMMON_DEV_ID, "soc"),
12061206
IBEX_DEV_UINT_PROP("trans_count", OT_EG_IBEX_WRAPPER_NUM_REGIONS)
12071207
),
12081208
}

0 commit comments

Comments
 (0)