From patchwork Fri Jul 22 15:59:08 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 3052 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 8A69023F18 for ; Fri, 22 Jul 2011 15:59:13 +0000 (UTC) Received: from mail-qw0-f52.google.com (mail-qw0-f52.google.com [209.85.216.52]) by fiordland.canonical.com (Postfix) with ESMTP id 5C428A18388 for ; Fri, 22 Jul 2011 15:59:13 +0000 (UTC) Received: by mail-qw0-f52.google.com with SMTP id 8so1725923qwb.11 for ; Fri, 22 Jul 2011 08:59:13 -0700 (PDT) Received: by 10.224.198.7 with SMTP id em7mr1402870qab.112.1311350353089; Fri, 22 Jul 2011 08:59:13 -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.229.217.78 with SMTP id hl14cs18045qcb; Fri, 22 Jul 2011 08:59:12 -0700 (PDT) Received: by 10.205.81.208 with SMTP id zz16mr491949bkb.372.1311350350870; Fri, 22 Jul 2011 08:59:10 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk [81.2.115.146]) by mx.google.com with ESMTPS id b6si3712550bka.135.2011.07.22.08.59.09 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 22 Jul 2011 08:59:10 -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 1QkI84-0003SW-DN; Fri, 22 Jul 2011 16:59:08 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH 3/3] vexpress, realview: Use pl111, not pl110 Date: Fri, 22 Jul 2011 16:59:08 +0100 Message-Id: <1311350348-13267-4-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1311350348-13267-1-git-send-email-peter.maydell@linaro.org> References: <1311350348-13267-1-git-send-email-peter.maydell@linaro.org> The Versatile Express, Realview EB, PBX A9 and PB A8 boards all use a PL111 for their graphics, not a PL110. Now we model the PL111, use it on these board models. Signed-off-by: Peter Maydell --- hw/realview.c | 2 +- hw/vexpress.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/realview.c b/hw/realview.c index 82f3d82..c789739 100644 --- a/hw/realview.c +++ b/hw/realview.c @@ -251,7 +251,7 @@ static void realview_init(ram_addr_t ram_size, sysbus_create_simple("pl061", 0x10014000, pic[7]); gpio2 = sysbus_create_simple("pl061", 0x10015000, pic[8]); - sysbus_create_simple("pl110_versatile", 0x10020000, pic[23]); + sysbus_create_simple("pl111", 0x10020000, pic[23]); dev = sysbus_create_varargs("pl181", 0x10005000, pic[17], pic[18], NULL); /* Wire up MMC card detect and read-only signals. These have diff --git a/hw/vexpress.c b/hw/vexpress.c index 9ffd332..c9766dd 100644 --- a/hw/vexpress.c +++ b/hw/vexpress.c @@ -150,7 +150,7 @@ static void vexpress_a9_init(ram_addr_t ram_size, /* Daughterboard peripherals : 0x10020000 .. 0x20000000 */ /* 0x10020000 PL111 CLCD (daughterboard) */ - sysbus_create_simple("pl110", 0x10020000, pic[44]); + sysbus_create_simple("pl111", 0x10020000, pic[44]); /* 0x10060000 AXI RAM */ /* 0x100e0000 PL341 Dynamic Memory Controller */