From: Peter A. G. Crosthwaite Date: Wed, 13 Jun 2012 04:46:44 +0000 (+1000) Subject: xilinx_timer: changed device name X-Git-Tag: v1.2.0-rc0~281 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=a61e4b07a30c062260d2d01771773f14820d1eb7;p=users%2Fdwmw2%2Fqemu.git xilinx_timer: changed device name Changed device name to xlnx,xps-timer. This is the exact name of the device in the xilinx EDK development tools. Signed-off-by: Peter A. G. Crosthwaite Signed-off-by: Edgar E. Iglesias --- diff --git a/hw/xilinx.h b/hw/xilinx.h index 97afa4552b..b8cf4240bf 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -20,7 +20,7 @@ xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq) { DeviceState *dev; - dev = qdev_create(NULL, "xilinx,timer"); + dev = qdev_create(NULL, "xlnx,xps-timer"); qdev_prop_set_uint32(dev, "one-timer-only", oto); qdev_prop_set_uint32(dev, "frequency", freq); qdev_init_nofail(dev); diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c index 72f7c0d421..0683ce1ecf 100644 --- a/hw/xilinx_timer.c +++ b/hw/xilinx_timer.c @@ -218,7 +218,7 @@ static int xilinx_timer_init(SysBusDevice *dev) ptimer_set_freq(xt->ptimer, t->freq_hz); } - memory_region_init_io(&t->mmio, &timer_ops, t, "xilinx-timer", + memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx,xps-timer", R_MAX * 4 * num_timers(t)); sysbus_init_mmio(dev, &t->mmio); return 0; @@ -240,7 +240,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_timer_info = { - .name = "xilinx,timer", + .name = "xlnx,xps-timer", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct timerblock), .class_init = xilinx_timer_class_init,