Commit 03a0e944 authored by Peter Maydell's avatar Peter Maydell Committed by Andrzej Zaborowski
Browse files

hw/vexpress.c, hw/realview.c: Add PL041 to VExpress, Realview boards 



Instantiate the PL041 audio on the Versatile Express and
Realview board models.

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarAndrzej Zaborowski <andrew.zaborowski@intel.com>
parent d028d02d

hw/realview.c

+7 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ static void realview_init(ram_addr_t ram_size, 
    MemoryRegion *ram_hi = g_new(MemoryRegion, 1);

    MemoryRegion *ram_alias = g_new(MemoryRegion, 1);

    MemoryRegion *ram_hack = g_new(MemoryRegion, 1);

    DeviceState *dev, *sysctl, *gpio2;

    DeviceState *dev, *sysctl, *gpio2, *pl041;

    SysBusDevice *busdev;

    qemu_irq *irqp;

    qemu_irq pic[64];
@@ -232,6 +232,12 @@ static void realview_init(ram_addr_t ram_size, 
        pic[n] = qdev_get_gpio_in(dev, n);

    }



    pl041 = qdev_create(NULL, "pl041");

    qdev_prop_set_uint32(pl041, "nc_fifo_depth", 512);

    qdev_init_nofail(pl041);

    sysbus_mmio_map(sysbus_from_qdev(pl041), 0, 0x10004000);

    sysbus_connect_irq(sysbus_from_qdev(pl041), 0, pic[19]);



    sysbus_create_simple("pl050_keyboard", 0x10006000, pic[20]);

    sysbus_create_simple("pl050_mouse", 0x10007000, pic[21]);

hw/vexpress.c

+6 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static void vexpress_a9_init(ram_addr_t ram_size, 
{

    CPUState *env = NULL;

    ram_addr_t ram_offset, vram_offset, sram_offset;

    DeviceState *dev, *sysctl;

    DeviceState *dev, *sysctl, *pl041;

    SysBusDevice *busdev;

    qemu_irq *irqp;

    qemu_irq pic[64];
@@ -118,6 +118,11 @@ static void vexpress_a9_init(ram_addr_t ram_size, 
    /* 0x10001000 SP810 system control */

    /* 0x10002000 serial bus PCI */

    /* 0x10004000 PL041 audio */

    pl041 = qdev_create(NULL, "pl041");

    qdev_prop_set_uint32(pl041, "nc_fifo_depth", 512);

    qdev_init_nofail(pl041);

    sysbus_mmio_map(sysbus_from_qdev(pl041), 0, 0x10004000);

    sysbus_connect_irq(sysbus_from_qdev(pl041), 0, pic[11]);



    dev = sysbus_create_varargs("pl181", 0x10005000, pic[9], pic[10], NULL);

    /* Wire up MMC card detect and read-only signals */