|
@@ -689,16 +689,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
|
|
|
* - SDIO Specification Version 3.0
|
|
|
* - eMMC Specification Version 4.51
|
|
|
*/
|
|
|
- if (!object_property_set_uint(sdhci, "sd-spec-version", 3, errp)) {
|
|
|
- return;
|
|
|
- }
|
|
|
- if (!object_property_set_uint(sdhci, "capareg", SDHCI_CAPABILITIES,
|
|
|
- errp)) {
|
|
|
- return;
|
|
|
- }
|
|
|
- if (!object_property_set_uint(sdhci, "uhs", UHS_I, errp)) {
|
|
|
- return;
|
|
|
- }
|
|
|
+ object_property_set_uint(sdhci, "sd-spec-version", 3, &error_abort);
|
|
|
+ object_property_set_uint(sdhci, "capareg", SDHCI_CAPABILITIES,
|
|
|
+ &error_abort);
|
|
|
+ object_property_set_uint(sdhci, "uhs", UHS_I, &error_abort);
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(sdhci), errp)) {
|
|
|
return;
|
|
|
}
|
|
@@ -763,14 +757,10 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
|
|
|
xlnx_zynqmp_create_unimp_mmio(s);
|
|
|
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_GDMA_CH; i++) {
|
|
|
- if (!object_property_set_uint(OBJECT(&s->gdma[i]), "bus-width", 128,
|
|
|
- errp)) {
|
|
|
- return;
|
|
|
- }
|
|
|
- if (!object_property_set_link(OBJECT(&s->gdma[i]), "dma",
|
|
|
- OBJECT(system_memory), errp)) {
|
|
|
- return;
|
|
|
- }
|
|
|
+ object_property_set_uint(OBJECT(&s->gdma[i]), "bus-width", 128,
|
|
|
+ &error_abort);
|
|
|
+ object_property_set_link(OBJECT(&s->gdma[i]), "dma",
|
|
|
+ OBJECT(system_memory), &error_abort);
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->gdma[i]), errp)) {
|
|
|
return;
|
|
|
}
|
|
@@ -811,10 +801,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
|
|
|
sysbus_connect_irq(SYS_BUS_DEVICE(&s->qspi_dma), 0,
|
|
|
qdev_get_gpio_in(DEVICE(&s->qspi_irq_orgate), 0));
|
|
|
|
|
|
- if (!object_property_set_link(OBJECT(&s->qspi), "stream-connected-dma",
|
|
|
- OBJECT(&s->qspi_dma), errp)) {
|
|
|
- return;
|
|
|
- }
|
|
|
+ object_property_set_link(OBJECT(&s->qspi), "stream-connected-dma",
|
|
|
+ OBJECT(&s->qspi_dma), &error_abort);
|
|
|
if (!sysbus_realize(SYS_BUS_DEVICE(&s->qspi), errp)) {
|
|
|
return;
|
|
|
}
|
|
@@ -833,10 +821,8 @@ static void xlnx_zynqmp_realize(DeviceState *dev, Error **errp)
|
|
|
}
|
|
|
|
|
|
for (i = 0; i < XLNX_ZYNQMP_NUM_USB; i++) {
|
|
|
- if (!object_property_set_link(OBJECT(&s->usb[i].sysbus_xhci), "dma",
|
|
|
- OBJECT(system_memory), errp)) {
|
|
|
- return;
|
|
|
- }
|
|
|
+ object_property_set_link(OBJECT(&s->usb[i].sysbus_xhci), "dma",
|
|
|
+ OBJECT(system_memory), &error_abort);
|
|
|
|
|
|
qdev_prop_set_uint32(DEVICE(&s->usb[i].sysbus_xhci), "intrs", 4);
|
|
|
qdev_prop_set_uint32(DEVICE(&s->usb[i].sysbus_xhci), "slots", 2);
|