diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:29 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2013-08-20 14:54:29 +0100 |
| commit | 2f69ba1736e9460aa04c46790c1d34edfbee563a (patch) | |
| tree | 19862d536e9eb0642fb5b7f73bff9824bdafe43f /hw/arm/kzm.c | |
| parent | 99d228d6e9b08488d62029c438f8381b8c72d109 (diff) | |
| download | qemu-2f69ba1736e9460aa04c46790c1d34edfbee563a.zip qemu-2f69ba1736e9460aa04c46790c1d34edfbee563a.tar.gz qemu-2f69ba1736e9460aa04c46790c1d34edfbee563a.tar.bz2 | |
hw/arm/kzm: Don't use arm_pic_init_cpu()
Drop the now-deprecated arm_pic_init_cpu() in favour of directly
getting the IRQ line from the ARMCPU object.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 1375977856-25046-7-git-send-email-peter.maydell@linaro.org
Diffstat (limited to 'hw/arm/kzm.c')
| -rw-r--r-- | hw/arm/kzm.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index bd6c05c..a248bf0 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -82,7 +82,6 @@ static void kzm_init(QEMUMachineInitArgs *args) MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1); MemoryRegion *ram_alias = g_new(MemoryRegion, 1); - qemu_irq *cpu_pic; DeviceState *dev; DeviceState *ccm; @@ -108,11 +107,10 @@ static void kzm_init(QEMUMachineInitArgs *args) memory_region_init_ram(sram, NULL, "kzm.sram", 0x4000); memory_region_add_subregion(address_space_mem, 0x1FFFC000, sram); - cpu_pic = arm_pic_init_cpu(cpu); dev = sysbus_create_varargs("imx_avic", 0x68000000, - cpu_pic[ARM_PIC_CPU_IRQ], - cpu_pic[ARM_PIC_CPU_FIQ], NULL); - + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ), + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ), + NULL); imx_serial_create(0, 0x43f90000, qdev_get_gpio_in(dev, 45)); imx_serial_create(1, 0x43f94000, qdev_get_gpio_in(dev, 32)); |