diff options
| author | Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com> | 2012-06-13 14:46:44 +1000 |
|---|---|---|
| committer | Edgar E. Iglesias <edgar.iglesias@gmail.com> | 2012-06-15 13:08:13 +0200 |
| commit | a61e4b07a30c062260d2d01771773f14820d1eb7 (patch) | |
| tree | ebfbcab1778e5d8ec5d0a0fd3cb754bc786fc118 /hw | |
| parent | abe098e4f93a80b0756c0e8e728bc78c47a91127 (diff) | |
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 <peter.crosthwaite@petalogix.com>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@gmail.com>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/xilinx.h | 2 | ||||
| -rw-r--r-- | hw/xilinx_timer.c | 4 |
2 files changed, 3 insertions, 3 deletions
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, |