diff --git a/hw/arm/xlnx-versal.c b/hw/arm/xlnx-versal.c index 015b472bde..fe58a8807e 100644 --- a/hw/arm/xlnx-versal.c +++ b/hw/arm/xlnx-versal.c @@ -842,7 +842,7 @@ static void versal_create_lpd_iou_slcr(Versal *s) MemoryRegion *mr; object_initialize_child(OBJECT(s), "lpd_iou_slcr", &s->lpd.iou.slcr, - TYPE_XLNX_LPD_IOU_SLCR); + TYPE_XILINX_LPD_IOU_SLCR); sbd = SYS_BUS_DEVICE(&s->lpd.iou.slcr); sysbus_realize(sbd, &error_fatal); diff --git a/hw/misc/xlnx-versal-lpd-iou-slcr.c b/hw/misc/xlnx-versal-lpd-iou-slcr.c index 9ee6e6cff5..7fd2a591c9 100644 --- a/hw/misc/xlnx-versal-lpd-iou-slcr.c +++ b/hw/misc/xlnx-versal-lpd-iou-slcr.c @@ -685,7 +685,7 @@ static void lpd_iou_slcr_init(Object *obj) SysBusDevice *sbd = SYS_BUS_DEVICE(obj); RegisterInfoArray *reg_array; - memory_region_init(&s->iomem, obj, TYPE_XLNX_LPD_IOU_SLCR, LPD_IOU_SLCR_R_MAX * 4); + memory_region_init(&s->iomem, obj, TYPE_XILINX_LPD_IOU_SLCR, LPD_IOU_SLCR_R_MAX * 4); reg_array = register_init_block32(DEVICE(obj), lpd_iou_slcr_regs_info, ARRAY_SIZE(lpd_iou_slcr_regs_info), @@ -702,7 +702,7 @@ static void lpd_iou_slcr_init(Object *obj) } static const VMStateDescription vmstate_lpd_iou_slcr = { - .name = TYPE_XLNX_LPD_IOU_SLCR, + .name = TYPE_XILINX_LPD_IOU_SLCR, .version_id = 1, .minimum_version_id = 1, .fields = (VMStateField[]) { @@ -721,7 +721,7 @@ static void lpd_iou_slcr_class_init(ObjectClass *klass, void *data) } static const TypeInfo lpd_iou_slcr_info = { - .name = TYPE_XLNX_LPD_IOU_SLCR, + .name = TYPE_XILINX_LPD_IOU_SLCR, .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(LPD_IOU_SLCR), .class_init = lpd_iou_slcr_class_init, diff --git a/include/hw/misc/xlnx-versal-lpd-iou-slcr.h b/include/hw/misc/xlnx-versal-lpd-iou-slcr.h index 78e8fb630e..be6d1c0e3e 100644 --- a/include/hw/misc/xlnx-versal-lpd-iou-slcr.h +++ b/include/hw/misc/xlnx-versal-lpd-iou-slcr.h @@ -24,12 +24,9 @@ #include "qom/object.h" -#define TYPE_XLNX_LPD_IOU_SLCR "xlnx.versal-lpd-iou-slcr" +#define TYPE_XILINX_LPD_IOU_SLCR "xlnx.versal-lpd-iou-slcr" -OBJECT_DECLARE_SIMPLE_TYPE(LPD_IOU_SLCR, XLNX_LPD_IOU_SLCR) - -#define XILINX_LPD_IOU_SLCR(obj) \ - OBJECT_CHECK(LPD_IOU_SLCR, (obj), TYPE_XLNX_LPD_IOU_SLCR) +OBJECT_DECLARE_SIMPLE_TYPE(LPD_IOU_SLCR, XILINX_LPD_IOU_SLCR) #define LPD_IOU_SLCR_R_MAX 459