Skip to content

Commit ba08136

Browse files
rivos-eblotrivos-eblot
committed
[ot] hw/riscv, hw/opentitan: all: fix dash vs. underscore link names
Signed-off-by: Emmanuel Blot <[email protected]>
1 parent 1d3f17f commit ba08136

File tree

11 files changed

+30
-30
lines changed

11 files changed

+30
-30
lines changed

‎hw/opentitan/ot_csrng.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1938,7 +1938,7 @@ static void ot_csrng_regs_write(void *opaque, hwaddr addr, uint64_t val64,
19381938
static Property ot_csrng_properties[] = {
19391939
DEFINE_PROP_LINK("entropy-src", OtCSRNGState, entropy_src,
19401940
TYPE_OT_ENTROPY_SRC, OtEntropySrcState *),
1941-
DEFINE_PROP_LINK("otp_ctrl", OtCSRNGState, otp_ctrl, TYPE_OT_OTP,
1941+
DEFINE_PROP_LINK("otp-ctrl", OtCSRNGState, otp_ctrl, TYPE_OT_OTP,
19421942
OtOTPState *),
19431943
DEFINE_PROP_END_OF_LIST(),
19441944
};

‎hw/opentitan/ot_entropy_src.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1803,7 +1803,7 @@ static Property ot_entropy_src_properties[] = {
18031803
DEFINE_PROP_UINT32("version", OtEntropySrcState, version, 0),
18041804
DEFINE_PROP_LINK("noise-src", OtEntropySrcState, noise_src, TYPE_DEVICE,
18051805
DeviceState *),
1806-
DEFINE_PROP_LINK("otp_ctrl", OtEntropySrcState, otp_ctrl, TYPE_OT_OTP,
1806+
DEFINE_PROP_LINK("otp-ctrl", OtEntropySrcState, otp_ctrl, TYPE_OT_OTP,
18071807
OtOTPState *),
18081808
DEFINE_PROP_END_OF_LIST(),
18091809
};

‎hw/opentitan/ot_keymgr.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2330,9 +2330,9 @@ static Property ot_keymgr_properties[] = {
23302330
OtFlashState *),
23312331
DEFINE_PROP_LINK("kmac", OtKeyMgrState, kmac, TYPE_OT_KMAC, OtKMACState *),
23322332
DEFINE_PROP_UINT8("kmac-app", OtKeyMgrState, kmac_app, UINT8_MAX),
2333-
DEFINE_PROP_LINK("lc_ctrl", OtKeyMgrState, lc_ctrl, TYPE_OT_LC_CTRL,
2333+
DEFINE_PROP_LINK("lc-ctrl", OtKeyMgrState, lc_ctrl, TYPE_OT_LC_CTRL,
23342334
OtLcCtrlState *),
2335-
DEFINE_PROP_LINK("otp_ctrl", OtKeyMgrState, otp_ctrl, TYPE_OT_OTP,
2335+
DEFINE_PROP_LINK("otp-ctrl", OtKeyMgrState, otp_ctrl, TYPE_OT_OTP,
23362336
OtOTPState *),
23372337
DEFINE_PROP_LINK("rom_ctrl", OtKeyMgrState, rom_ctrl, TYPE_OT_ROM_CTRL,
23382338
OtRomCtrlState *),

‎hw/opentitan/ot_keymgr_dpe.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,9 +2002,9 @@ static Property ot_keymgr_dpe_properties[] = {
20022002
DEFINE_PROP_LINK("kmac", OtKeyMgrDpeState, kmac, TYPE_OT_KMAC,
20032003
OtKMACState *),
20042004
DEFINE_PROP_UINT8("kmac-app", OtKeyMgrDpeState, kmac_app, UINT8_MAX),
2005-
DEFINE_PROP_LINK("lc_ctrl", OtKeyMgrDpeState, lc_ctrl, TYPE_OT_LC_CTRL,
2005+
DEFINE_PROP_LINK("lc-ctrl", OtKeyMgrDpeState, lc_ctrl, TYPE_OT_LC_CTRL,
20062006
OtLcCtrlState *),
2007-
DEFINE_PROP_LINK("otp_ctrl", OtKeyMgrDpeState, otp, TYPE_OT_OTP,
2007+
DEFINE_PROP_LINK("otp-ctrl", OtKeyMgrDpeState, otp, TYPE_OT_OTP,
20082008
OtOTPState *),
20092009
DEFINE_PROP_LINK("rom0", OtKeyMgrDpeState, rom_ctrl[0], TYPE_OT_ROM_CTRL,
20102010
OtRomCtrlState *),

‎hw/opentitan/ot_lc_ctrl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2137,7 +2137,7 @@ static void ot_lc_ctrl_get_keymgr_div(const OtLcCtrlState *s,
21372137

21382138
static Property ot_lc_ctrl_properties[] = {
21392139
DEFINE_PROP_STRING(OT_COMMON_DEV_ID, OtLcCtrlState, ot_id),
2140-
DEFINE_PROP_LINK("otp_ctrl", OtLcCtrlState, otp_ctrl, TYPE_OT_OTP,
2140+
DEFINE_PROP_LINK("otp-ctrl", OtLcCtrlState, otp_ctrl, TYPE_OT_OTP,
21412141
OtOTPState *),
21422142
DEFINE_PROP_LINK("kmac", OtLcCtrlState, kmac, TYPE_OT_KMAC, OtKMACState *),
21432143
DEFINE_PROP_STRING("raw_unlock_token", OtLcCtrlState,

‎hw/opentitan/ot_pwrmgr.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -984,7 +984,7 @@ static void ot_pwrmgr_regs_write(void *opaque, hwaddr addr, uint64_t val64,
984984
static Property ot_pwrmgr_properties[] = {
985985
DEFINE_PROP_STRING(OT_COMMON_DEV_ID, OtPwrMgrState, ot_id),
986986
DEFINE_PROP_STRING("clocks", OtPwrMgrState, cfg_clocks),
987-
DEFINE_PROP_LINK("clock_ctrl", OtPwrMgrState, clock_ctrl, TYPE_DEVICE,
987+
DEFINE_PROP_LINK("clock-ctrl", OtPwrMgrState, clock_ctrl, TYPE_DEVICE,
988988
DeviceState *),
989989
DEFINE_PROP_UINT8("num-rom", OtPwrMgrState, num_rom, 0),
990990
DEFINE_PROP_UINT8("version", OtPwrMgrState, version, UINT8_MAX),

‎hw/opentitan/ot_sram_ctrl.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -668,7 +668,7 @@ static MemTxResult ot_sram_ctrl_mem_init_write_with_attrs(
668668

669669
static Property ot_sram_ctrl_properties[] = {
670670
DEFINE_PROP_STRING(OT_COMMON_DEV_ID, OtSramCtrlState, ot_id),
671-
DEFINE_PROP_LINK("otp_ctrl", OtSramCtrlState, otp_ctrl, TYPE_OT_OTP,
671+
DEFINE_PROP_LINK("otp-ctrl", OtSramCtrlState, otp_ctrl, TYPE_OT_OTP,
672672
OtOTPState *),
673673
DEFINE_PROP_LINK("vmapper", OtSramCtrlState, vmapper, TYPE_OT_VMAPPER,
674674
OtVMapperState *),

‎hw/riscv/dtm.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -516,7 +516,7 @@ static void riscv_dtm_activate_dms(RISCVDTMState *s)
516516

517517
static Property riscv_dtm_properties[] = {
518518
DEFINE_PROP_UINT32("abits", RISCVDTMState, abits, 0x7u),
519-
DEFINE_PROP_LINK("tap_ctrl", RISCVDTMState, tap_ctrl, TYPE_DEVICE,
519+
DEFINE_PROP_LINK("tap-ctrl", RISCVDTMState, tap_ctrl, TYPE_DEVICE,
520520
DeviceState *),
521521
DEFINE_PROP_END_OF_LIST(),
522522
};

‎hw/riscv/ibexdemo.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ static const IbexDeviceDef ibexdemo_soc_devices[] = {
152152
[IBEXDEMO_SOC_DEV_DTM] = {
153153
.type = TYPE_RISCV_DTM,
154154
.link = IBEXDEVICELINKDEFS(
155-
IBEXDEMO_SOC_DEVLINK("tap_ctrl", TAP_CTRL)
155+
IBEXDEMO_SOC_DEVLINK("tap-ctrl", TAP_CTRL)
156156
),
157157
.prop = IBEXDEVICEPROPDEFS(
158158
IBEX_DEV_UINT_PROP("abits", 7u)

‎hw/riscv/ot_darjeeling.c‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
523523
[OT_DJ_SOC_DEV_DTM] = {
524524
.type = TYPE_RISCV_DTM,
525525
.link = IBEXDEVICELINKDEFS(
526-
OT_DJ_SOC_DEVLINK("tap_ctrl", TAP_CTRL)
526+
OT_DJ_SOC_DEVLINK("tap-ctrl", TAP_CTRL)
527527
),
528528
.prop = IBEXDEVICEPROPDEFS(
529529
IBEX_DEV_UINT_PROP("abits", 12u)
@@ -716,8 +716,8 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
716716
OT_DJ_SOC_DEVLINK("edn", EDN0),
717717
OT_DJ_SOC_DEVLINK("kmac", KMAC),
718718
OT_DJ_SOC_DEVLINK("otbn", OTBN),
719-
OT_DJ_SOC_DEVLINK("lc_ctrl", LC_CTRL),
720-
OT_DJ_SOC_DEVLINK("otp_ctrl", OTP_CTRL),
719+
OT_DJ_SOC_DEVLINK("lc-ctrl", LC_CTRL),
720+
OT_DJ_SOC_DEVLINK("otp-ctrl", OTP_CTRL),
721721
OT_DJ_SOC_DEVLINK("rom0", ROM_CTRL0),
722722
OT_DJ_SOC_DEVLINK("rom1", ROM_CTRL1)
723723
),
@@ -741,7 +741,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
741741
),
742742
.link = IBEXDEVICELINKDEFS(
743743
OT_DJ_SOC_DEVLINK("entropy-src", ENTROPY_SRC),
744-
OT_DJ_SOC_DEVLINK("otp_ctrl", OTP_CTRL)
744+
OT_DJ_SOC_DEVLINK("otp-ctrl", OTP_CTRL)
745745
),
746746
},
747747
[OT_DJ_SOC_DEV_ENTROPY_SRC] = {
@@ -759,7 +759,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
759759
),
760760
.link = IBEXDEVICELINKDEFS(
761761
OT_DJ_SOC_DEVLINK("noise-src", AST),
762-
OT_DJ_SOC_DEVLINK("otp_ctrl", OTP_CTRL)
762+
OT_DJ_SOC_DEVLINK("otp-ctrl", OTP_CTRL)
763763
),
764764
.prop = IBEXDEVICEPROPDEFS(
765765
IBEX_DEV_UINT_PROP("version", 3)
@@ -811,7 +811,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
811811
OT_DJ_SOC_GPIO_ALERT(0, 41)
812812
),
813813
.link = IBEXDEVICELINKDEFS(
814-
OT_DJ_SOC_DEVLINK("otp_ctrl", OTP_CTRL),
814+
OT_DJ_SOC_DEVLINK("otp-ctrl", OTP_CTRL),
815815
OT_DJ_SOC_DEVLINK("vmapper", VMAPPER)
816816
),
817817
.prop = IBEXDEVICEPROPDEFS(
@@ -830,7 +830,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
830830
OT_DJ_SOC_GPIO_ALERT(0, 42)
831831
),
832832
.link = IBEXDEVICELINKDEFS(
833-
OT_DJ_SOC_DEVLINK("otp_ctrl", OTP_CTRL),
833+
OT_DJ_SOC_DEVLINK("otp-ctrl", OTP_CTRL),
834834
OT_DJ_SOC_DEVLINK("vmapper", VMAPPER)
835835
),
836836
.prop = IBEXDEVICEPROPDEFS(
@@ -1175,7 +1175,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
11751175
OT_DJ_SOC_RSP(OT_PWRMGR_LC, PWRMGR)
11761176
),
11771177
.link = IBEXDEVICELINKDEFS(
1178-
OT_DJ_SOC_DEVLINK("otp_ctrl", OTP_CTRL),
1178+
OT_DJ_SOC_DEVLINK("otp-ctrl", OTP_CTRL),
11791179
OT_DJ_SOC_DEVLINK("kmac", KMAC)
11801180
),
11811181
.prop = IBEXDEVICEPROPDEFS(
@@ -1285,7 +1285,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
12851285
OT_RSTMGR_RST_REQ, 0)
12861286
),
12871287
.link = IBEXDEVICELINKDEFS(
1288-
OT_DJ_SOC_DEVLINK("clock_ctrl", AST)
1288+
OT_DJ_SOC_DEVLINK("clock-ctrl", AST)
12891289
),
12901290
.prop = IBEXDEVICEPROPDEFS(
12911291
IBEX_DEV_STRING_PROP("clocks", "main,io"),
@@ -1421,7 +1421,7 @@ static const IbexDeviceDef ot_dj_soc_devices[] = {
14211421
OT_DJ_SOC_GPIO_ALERT(0, 21)
14221422
),
14231423
.link = IBEXDEVICELINKDEFS(
1424-
OT_DJ_SOC_DEVLINK("otp_ctrl", OTP_CTRL),
1424+
OT_DJ_SOC_DEVLINK("otp-ctrl", OTP_CTRL),
14251425
OT_DJ_SOC_DEVLINK("vmapper", VMAPPER)
14261426
),
14271427
.prop = IBEXDEVICEPROPDEFS(

0 commit comments

Comments
 (0)