qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Peter Maydell <peter.maydell@linaro.org>
To: Anthony Liguori <anthony@codemonkey.ws>, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 3/6] vexpress, realview: Use pl111, not pl110
Date: Thu, 18 Aug 2011 00:49:35 +0100	[thread overview]
Message-ID: <1313624978-5350-4-git-send-email-peter.maydell@linaro.org> (raw)
In-Reply-To: <1313624978-5350-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 <peter.maydell@linaro.org>
---
 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 94ab900..549bb15 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 */
-- 
1.7.1

  parent reply	other threads:[~2011-08-17 23:50 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-08-17 23:49 [Qemu-devel] [PULL 0/6] misc ARM device fixes Peter Maydell
2011-08-17 23:49 ` [Qemu-devel] [PATCH 1/6] hw/pl110: Model the PL111 CLCD controller Peter Maydell
2011-08-17 23:49 ` [Qemu-devel] [PATCH 2/6] versatilepb: Implement SYS_CLCD mux control register bits Peter Maydell
2011-08-17 23:49 ` Peter Maydell [this message]
2011-08-17 23:49 ` [Qemu-devel] [PATCH 4/6] hw/pl061: Convert to VMState Peter Maydell
2011-08-17 23:49 ` [Qemu-devel] [PATCH 5/6] hw/pl061.c: Support GPIOAMSEL register Peter Maydell
2011-08-17 23:49 ` [Qemu-devel] [PATCH 6/6] hw/stellaris: Add support for RCC2 register Peter Maydell
2011-08-21 23:39 ` [Qemu-devel] [PULL 0/6] misc ARM device fixes Anthony Liguori

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1313624978-5350-4-git-send-email-peter.maydell@linaro.org \
    --to=peter.maydell@linaro.org \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).