Am 13.06.2012 06:46, schrieb Peter A. G. Crosthwaite:
> Changed device name to xlnx,xps-uartlite. 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>
Dito.
/-F
> ---
> hw/petalogix_s3adsp1800_mmu.c | 2 +-
> hw/xilinx_uartlite.c | 5 +++--
> 2 files changed, 4 insertions(+), 3 deletions(-)
>
> diff --git a/hw/petalogix_s3adsp1800_mmu.c b/hw/petalogix_s3adsp1800_mmu.c
> index f41c559..7d83c21 100644
> --- a/hw/petalogix_s3adsp1800_mmu.c
> +++ b/hw/petalogix_s3adsp1800_mmu.c
> @@ -104,7 +104,7 @@ petalogix_s3adsp1800_init(ram_addr_t ram_size,
> irq[i] = qdev_get_gpio_in(dev, i);
> }
>
> - sysbus_create_simple("xilinx,uartlite", UARTLITE_BASEADDR, irq[3]);
> + sysbus_create_simple("xlnx.xps-uartlite", UARTLITE_BASEADDR, irq[3]);
> /* 2 timers at irq 2 @ 62 Mhz. */
> xilinx_timer_create(TIMER_BASEADDR, irq[0], 2, 62 * 1000000);
> xilinx_ethlite_create(&nd_table[0], ETHLITE_BASEADDR, irq[1], 0, 0);
> diff --git a/hw/xilinx_uartlite.c b/hw/xilinx_uartlite.c
> index aa0170d..d0f32db 100644
> --- a/hw/xilinx_uartlite.c
> +++ b/hw/xilinx_uartlite.c
> @@ -202,7 +202,8 @@ static int xilinx_uartlite_init(SysBusDevice *dev)
> sysbus_init_irq(dev, &s->irq);
>
> uart_update_status(s);
> - memory_region_init_io(&s->mmio, &uart_ops, s, "xilinx-uartlite", R_MAX *
> 4);
> + memory_region_init_io(&s->mmio, &uart_ops, s, "xlnx.xps-uartlite",
> + R_MAX * 4);
> sysbus_init_mmio(dev, &s->mmio);
>
> s->chr = qemu_char_get_next_serial();
> @@ -219,7 +220,7 @@ static void xilinx_uartlite_class_init(ObjectClass
> *klass, void *data)
> }
>
> static TypeInfo xilinx_uartlite_info = {
> - .name = "xilinx,uartlite",
> + .name = "xlnx.xps-uartlite",
> .parent = TYPE_SYS_BUS_DEVICE,
> .instance_size = sizeof (struct xlx_uartlite),
> .class_init = xilinx_uartlite_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
