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: 106326 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id CD4A1B6F00 for ; Sat, 23 Jul 2011 02:26:40 +1000 (EST) Received: from localhost ([::1]:56412 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkIYe-0006fL-NM for incoming@patchwork.ozlabs.org; Fri, 22 Jul 2011 12:26:36 -0400 Received: from eggs.gnu.org ([140.186.70.92]:48848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkIYV-0006f7-DN for qemu-devel@nongnu.org; Fri, 22 Jul 2011 12:26:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QkIYT-00005f-Qn for qemu-devel@nongnu.org; Fri, 22 Jul 2011 12:26:27 -0400 Received: from mnementh.archaic.org.uk ([81.2.115.146]:37877) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QkIYT-000057-Ka for qemu-devel@nongnu.org; Fri, 22 Jul 2011 12:26:25 -0400 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 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> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 81.2.115.146 Cc: patches@linaro.org Subject: [Qemu-devel] [PATCH 3/3] vexpress, realview: Use pl111, not pl110 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.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 */