aboutsummaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorPeter A. G. Crosthwaite <peter.crosthwaite@petalogix.com>2012-06-13 14:46:51 +1000
committerEdgar E. Iglesias <edgar.iglesias@gmail.com>2012-06-15 13:08:13 +0200
commitda9fa17ee9bece7e7ef54681832427c1d6baf554 (patch)
treedc8ed52666f04d8ed1d678ba86191be7dc7daf19 /hw
parentcec6f8ca5b22562ee757e2a55c21f7fa20d5200a (diff)
xilinx_axidma: changed device name
Changed device name to xlnx,axi-dma. 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.h2
-rw-r--r--hw/xilinx_axidma.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/hw/xilinx.h b/hw/xilinx.h
index 8f915b435b..7df21eb958 100644
--- a/hw/xilinx.h
+++ b/hw/xilinx.h
@@ -75,7 +75,7 @@ xilinx_axiethernetdma_create(void *dmach,
{
DeviceState *dev = NULL;
- dev = qdev_create(NULL, "xilinx,axidma");
+ dev = qdev_create(NULL, "xlnx.axi-dma");
qdev_prop_set_uint32(dev, "freqhz", freqhz);
qdev_prop_set_ptr(dev, "dmach", dmach);
qdev_init_nofail(dev);
diff --git a/hw/xilinx_axidma.c b/hw/xilinx_axidma.c
index 59373b51d9..f4bec37c7a 100644
--- a/hw/xilinx_axidma.c
+++ b/hw/xilinx_axidma.c
@@ -473,7 +473,7 @@ static int xilinx_axidma_init(SysBusDevice *dev)
xlx_dma_connect_dma(s->dmach, s, axidma_push);
memory_region_init_io(&s->iomem, &axidma_ops, s,
- "axidma", R_MAX * 4 * 2);
+ "xlnx.axi-dma", R_MAX * 4 * 2);
sysbus_init_mmio(dev, &s->iomem);
for (i = 0; i < 2; i++) {
@@ -502,7 +502,7 @@ static void axidma_class_init(ObjectClass *klass, void *data)
}
static TypeInfo axidma_info = {
- .name = "xilinx,axidma",
+ .name = "xlnx.axi-dma",
.parent = TYPE_SYS_BUS_DEVICE,
.instance_size = sizeof(struct XilinxAXIDMA),
.class_init = axidma_class_init,