From patchwork Wed Oct 19 13:31:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 4739 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id 8702423E0B for ; Wed, 19 Oct 2011 13:32:09 +0000 (UTC) Received: from mail-yx0-f180.google.com (mail-yx0-f180.google.com [209.85.213.180]) by fiordland.canonical.com (Postfix) with ESMTP id 52A59A187CB for ; Wed, 19 Oct 2011 13:32:09 +0000 (UTC) Received: by yxm34 with SMTP id 34so2395401yxm.11 for ; Wed, 19 Oct 2011 06:32:08 -0700 (PDT) Received: by 10.223.85.139 with SMTP id o11mr11249291fal.0.1319031117509; Wed, 19 Oct 2011 06:31:57 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.152.1.71 with SMTP id 7cs84160lak; Wed, 19 Oct 2011 06:31:57 -0700 (PDT) Received: by 10.227.59.70 with SMTP id k6mr2537838wbh.24.1319031116504; Wed, 19 Oct 2011 06:31:56 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id gd5si4511969wbb.63.2011.10.19.06.31.56 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 19 Oct 2011 06:31:56 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) client-ip=81.2.115.146; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 81.2.115.146 as permitted sender) smtp.mail=pm215@archaic.org.uk Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.72) (envelope-from ) id 1RGWFM-0000H6-Qn; Wed, 19 Oct 2011 14:31:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Mathieu Sonet Subject: [PATCH] hw/vexpress.c, hw/realview.c: Add PL041 to VExpress, Realview boards Date: Wed, 19 Oct 2011 14:31:52 +0100 Message-Id: <1319031112-1033-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 Instantiate the PL041 audio on the Versatile Express and Realview board models. Signed-off-by: Peter Maydell --- This obviously is intended to be applied after Mathieu Sonet's PL041/AACI v5 patch. hw/realview.c | 8 +++++++- hw/vexpress.c | 7 ++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hw/realview.c b/hw/realview.c index 549bb15..433d397 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -126,7 +126,7 @@ static void realview_init(ram_addr_t ram_size, { CPUState *env = NULL; ram_addr_t ram_offset; - DeviceState *dev, *sysctl, *gpio2; + DeviceState *dev, *sysctl, *gpio2, *pl041; SysBusDevice *busdev; qemu_irq *irqp; qemu_irq pic[64]; @@ -233,6 +233,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]); diff --git a/hw/vexpress.c b/hw/vexpress.c index c9766dd..0940a26 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -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 */