[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 04/11] xilinx_timer: changed device name
From: |
Peter A. G. Crosthwaite |
Subject: |
[Qemu-devel] [PATCH v2 04/11] xilinx_timer: changed device name |
Date: |
Wed, 13 Jun 2012 14:46:44 +1000 |
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 <address@hidden>
---
hw/xilinx.h | 2 +-
hw/xilinx_timer.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/hw/xilinx.h b/hw/xilinx.h
index 7b8ad51..9ff4c2b 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 72f7c0d..0683ce1 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,
--
1.7.3.2
- [Qemu-devel] [PATCH v2 00/11] Xilinx Devs: refactored device and property names, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 01/11] xilinx_uartlite: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 02/11] xilinx_timer: added default frequency, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 03/11] xilinx_timer: changed nr_timers to one_timer_only, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 04/11] xilinx_timer: changed device name,
Peter A. G. Crosthwaite <=
- [Qemu-devel] [PATCH v2 05/11] xilinx_intc: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 06/11] xilinx_ethlite: tweaked naming of ping-pong props, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 07/11] xilinx_ethlite: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 09/11] xilinx_axienet: changed device name, Peter A. G. Crosthwaite, 2012/06/13
- [Qemu-devel] [PATCH v2 11/11] xilinx_axidma: changed device name, Peter A. G. Crosthwaite, 2012/06/13