1 From 030d44c473036d44abc76562860a89b21220ca2f Mon Sep 17 00:00:00 2001
2 From: "Peter A. G. Crosthwaite" <peter.crosthwaite@petalogix.com>
3 Date: Thu, 28 Jun 2012 12:52:23 +1000
4 Subject: [PATCH] xilinx_timer: Removed comma in device name
6 Fixes an error in a61e4b07a30c062260d2d01771773f14820d1eb7
8 Signed-off-by: Peter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>
9 (cherry picked from commit c0a1dcb9f0baf9269f8baeb02cbcca8dad75454c)
11 Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
14 hw/xilinx_timer.c | 4 ++--
15 2 files changed, 3 insertions(+), 3 deletions(-)
17 diff --git a/hw/xilinx.h b/hw/xilinx.h
18 index 556c5aa..df06a00 100644
21 @@ -21,7 +21,7 @@ xilinx_timer_create(target_phys_addr_t base, qemu_irq irq, int oto, int freq)
25 - dev = qdev_create(NULL, "xlnx,xps-timer");
26 + dev = qdev_create(NULL, "xlnx.xps-timer");
27 qdev_prop_set_uint32(dev, "one-timer-only", oto);
28 qdev_prop_set_uint32(dev, "frequency", freq);
29 qdev_init_nofail(dev);
30 diff --git a/hw/xilinx_timer.c b/hw/xilinx_timer.c
31 index b562bd0..053ba02 100644
32 --- a/hw/xilinx_timer.c
33 +++ b/hw/xilinx_timer.c
34 @@ -217,7 +217,7 @@ static int xilinx_timer_init(SysBusDevice *dev)
35 ptimer_set_freq(xt->ptimer, t->freq_hz);
38 - memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx,xps-timer",
39 + memory_region_init_io(&t->mmio, &timer_ops, t, "xlnx.xps-timer",
40 R_MAX * 4 * num_timers(t));
41 sysbus_init_mmio(dev, &t->mmio);
43 @@ -239,7 +239,7 @@ static void xilinx_timer_class_init(ObjectClass *klass, void *data)
46 static TypeInfo xilinx_timer_info = {
47 - .name = "xlnx,xps-timer",
48 + .name = "xlnx.xps-timer",
49 .parent = TYPE_SYS_BUS_DEVICE,
50 .instance_size = sizeof(struct timerblock),
51 .class_init = xilinx_timer_class_init,