Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite: > 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.crosthwa...@petalogix.com>
Same here. Please review more carefully. /-F > --- > hw/xilinx.h | 2 +- > hw/xilinx_axidma.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/xilinx.h b/hw/xilinx.h > index 8f915b4..7df21eb 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 59373b5..f4bec37 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, -- SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer; HRB 16746 AG Nürnberg