On Thu, Jan 4, 2018 at 6:40 AM, Philippe Mathieu-Daudé <f4...@amsat.org> wrote:
> Signed-off-by: Philippe Mathieu-Daudé <f4...@amsat.org>
Reviewed-by: Alistair Francis <alistair.fran...@xilinx.com>
Alistair
> ---
> hw/arm/xilinx_zynq.c | 1 +
> hw/arm/xlnx-zynqmp.c | 2 +-
> 2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/hw/arm/xilinx_zynq.c b/hw/arm/xilinx_zynq.c
> index c45c364583..5ae18921c1 100644
> --- a/hw/arm/xilinx_zynq.c
> +++ b/hw/arm/xilinx_zynq.c
> @@ -245,6 +245,7 @@ static void zynq_init(MachineState *machine)
> sysbus_create_varargs("cadence_ttc", 0xF8002000,
> pic[69-IRQ_OFFSET], pic[70-IRQ_OFFSET], pic[71-IRQ_OFFSET],
> NULL);
>
> + /* cdns,gem */
> gem_init(&nd_table[0], 0xE000B000, pic[54-IRQ_OFFSET]);
> gem_init(&nd_table[1], 0xE000C000, pic[77-IRQ_OFFSET]);
>
> diff --git a/hw/arm/xlnx-zynqmp.c b/hw/arm/xlnx-zynqmp.c
> index 38f038786c..1aed89707c 100644
> --- a/hw/arm/xlnx-zynqmp.c
> +++ b/hw/arm/xlnx-zynqmp.c
> @@ -150,7 +150,7 @@ 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);
> + object_initialize(&s->gem[i], sizeof(s->gem[i]), "cdns,zynqmp-gem");
> qdev_set_parent_bus(DEVICE(&s->gem[i]), sysbus_get_default());
> }
>
> --
> 2.15.1
>
>
