[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC PATCH v2 9/9] hw/arm/xlnx-zynqmp: use Linux FDT names
From: |
Philippe Mathieu-Daudé |
Subject: |
[Qemu-devel] [RFC PATCH v2 9/9] hw/arm/xlnx-zynqmp: use Linux FDT names |
Date: |
Mon, 8 Jan 2018 23:00:54 -0300 |
Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
---
hw/arm/xlnx-zynqmp.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
index 325642058b..fdcd6801b6 100644
--- a/hw/arm/xlnx-zynqmp.c
+++ b/hw/arm/xlnx-zynqmp.c
@@ -24,6 +24,7 @@
#include "exec/address-spaces.h"
#include "sysemu/kvm.h"
#include "kvm_arm.h"
+#include "hw/sysbus-fdt.h"
#define GIC_NUM_SPI_INTR 160
@@ -138,6 +139,7 @@ static void xlnx_zynqmp_init(Object *obj)
XlnxZynqMPState *s = XLNX_ZYNQMP(obj);
int i;
int num_apus = MIN(smp_cpus, XLNX_ZYNQMP_NUM_APU_CPUS);
+ const char *type_name;
for (i = 0; i < num_apus; i++) {
object_initialize(&s->apu_cpu[i], sizeof(s->apu_cpu[i]),
@@ -150,12 +152,14 @@ static void xlnx_zynqmp_init(Object *obj)
qdev_set_parent_bus(DEVICE(&s->gic), sysbus_get_default());
for (i = 0; i < XLNX_ZYNQMP_NUM_GEMS; i++) {
- object_initialize(&s->gem[i], sizeof(s->gem[i]), TYPE_CADENCE_GEM);
+ type_name = type_resolve_fdt_alias("cdns,zynqmp-gem");
+ object_initialize(&s->gem[i], sizeof(s->gem[i]), type_name);
qdev_set_parent_bus(DEVICE(&s->gem[i]), sysbus_get_default());
}
for (i = 0; i < XLNX_ZYNQMP_NUM_UARTS; i++) {
- object_initialize(&s->uart[i], sizeof(s->uart[i]), TYPE_CADENCE_UART);
+ type_name = type_resolve_fdt_alias("xlnx,zynqmp-uart");
+ object_initialize(&s->uart[i], sizeof(s->uart[i]), type_name);
qdev_set_parent_bus(DEVICE(&s->uart[i]), sysbus_get_default());
}
@@ -175,13 +179,15 @@ static void xlnx_zynqmp_init(Object *obj)
qdev_set_parent_bus(DEVICE(&s->spi[i]), sysbus_get_default());
}
- object_initialize(&s->qspi, sizeof(s->qspi), TYPE_XLNX_ZYNQMP_QSPIPS);
+ type_name = type_resolve_fdt_alias("xlnx.zynq-qspi");
+ object_initialize(&s->qspi, sizeof(s->qspi), type_name);
qdev_set_parent_bus(DEVICE(&s->qspi), sysbus_get_default());
object_initialize(&s->dp, sizeof(s->dp), TYPE_XLNX_DP);
qdev_set_parent_bus(DEVICE(&s->dp), sysbus_get_default());
- object_initialize(&s->dpdma, sizeof(s->dpdma), TYPE_XLNX_DPDMA);
+ type_name = type_resolve_fdt_alias("xlnx,axi-dpdma-1.0");
+ object_initialize(&s->dpdma, sizeof(s->dpdma), type_name);
qdev_set_parent_bus(DEVICE(&s->dpdma), sysbus_get_default());
}
--
2.15.1
- [Qemu-devel] [RFC PATCH v2 0/9] resolv device by Flattened Device Tree alias name, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 1/9] hw/sysbus: add helpers to register FDT aliases, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 2/9] hw/char/cadence_uart: add FDT aliases, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 4/9] hw/timer/cadence_ttc: add FDT aliases, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 3/9] hw/net/cadence_gem: add FDT aliases, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 5/9] hw/dma/axidma: add 'xlnx, eth-dma' FDT alias, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 6/9] hw/usb/hcd-ehci: add 'xlnx, ps7-usb' FDT aliases, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 7/9] hw/ssi/xlnx-spips: add 'xlnx.zynq-qspi' FDT alias, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 8/9] hw/dma/xlnx_dpdma: add 'xlnx, axi-dpdma-1.0' FDT alias, Philippe Mathieu-Daudé, 2018/01/08
- [Qemu-devel] [RFC PATCH v2 9/9] hw/arm/xlnx-zynqmp: use Linux FDT names,
Philippe Mathieu-Daudé <=