| Message ID | 83d316791ba43df195935931f8d4ce192967965e.1339562634.git.peter.crosthwaite@petalogix.com |
|---|---|
| State | New |
| Headers | show |
Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite: > Changed device name to xlnx,xps-intc. 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> Dito. /-F > --- > hw/xilinx.h | 2 +- > hw/xilinx_intc.c | 4 ++-- > 2 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/hw/xilinx.h b/hw/xilinx.h > index 9ff4c2b..c183e2f 100644 > --- a/hw/xilinx.h > +++ b/hw/xilinx.h > @@ -6,7 +6,7 @@ xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr) > { > DeviceState *dev; > > - dev = qdev_create(NULL, "xilinx,intc"); > + dev = qdev_create(NULL, "xlnx.xps-intc"); > qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr); > qdev_init_nofail(dev); > sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); > diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c > index 553f848..386fd30 100644 > --- a/hw/xilinx_intc.c > +++ b/hw/xilinx_intc.c > @@ -156,7 +156,7 @@ static int xilinx_intc_init(SysBusDevice *dev) > qdev_init_gpio_in(&dev->qdev, irq_handler, 32); > sysbus_init_irq(dev, &p->parent_irq); > > - memory_region_init_io(&p->mmio, &pic_ops, p, "xilinx-pic", R_MAX * 4); > + memory_region_init_io(&p->mmio, &pic_ops, p, "xlnx.xps-intc", R_MAX * 4); > sysbus_init_mmio(dev, &p->mmio); > return 0; > } > @@ -176,7 +176,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data) > } > > static TypeInfo xilinx_intc_info = { > - .name = "xilinx,intc", > + .name = "xlnx.xps-intc", > .parent = TYPE_SYS_BUS_DEVICE, > .instance_size = sizeof(struct xlx_pic), > .class_init = xilinx_intc_class_init,
diff --git a/hw/xilinx.h b/hw/xilinx.h index 9ff4c2b..c183e2f 100644 --- a/hw/xilinx.h +++ b/hw/xilinx.h @@ -6,7 +6,7 @@ xilinx_intc_create(target_phys_addr_t base, qemu_irq irq, int kind_of_intr) { DeviceState *dev; - dev = qdev_create(NULL, "xilinx,intc"); + dev = qdev_create(NULL, "xlnx.xps-intc"); qdev_prop_set_uint32(dev, "kind-of-intr", kind_of_intr); qdev_init_nofail(dev); sysbus_mmio_map(sysbus_from_qdev(dev), 0, base); diff --git a/hw/xilinx_intc.c b/hw/xilinx_intc.c index 553f848..386fd30 100644 --- a/hw/xilinx_intc.c +++ b/hw/xilinx_intc.c @@ -156,7 +156,7 @@ static int xilinx_intc_init(SysBusDevice *dev) qdev_init_gpio_in(&dev->qdev, irq_handler, 32); sysbus_init_irq(dev, &p->parent_irq); - memory_region_init_io(&p->mmio, &pic_ops, p, "xilinx-pic", R_MAX * 4); + memory_region_init_io(&p->mmio, &pic_ops, p, "xlnx.xps-intc", R_MAX * 4); sysbus_init_mmio(dev, &p->mmio); return 0; } @@ -176,7 +176,7 @@ static void xilinx_intc_class_init(ObjectClass *klass, void *data) } static TypeInfo xilinx_intc_info = { - .name = "xilinx,intc", + .name = "xlnx.xps-intc", .parent = TYPE_SYS_BUS_DEVICE, .instance_size = sizeof(struct xlx_pic), .class_init = xilinx_intc_class_init,
Changed device name to xlnx,xps-intc. 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> --- hw/xilinx.h | 2 +- hw/xilinx_intc.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-)