From patchwork Tue Oct 18 15:12:54 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 4734 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 7F53523E0C for ; Tue, 18 Oct 2011 15:13:01 +0000 (UTC) Received: from mail-gx0-f180.google.com (mail-gx0-f180.google.com [209.85.161.180]) by fiordland.canonical.com (Postfix) with ESMTP id 3C290A1853A for ; Tue, 18 Oct 2011 15:13:01 +0000 (UTC) Received: by ggnv2 with SMTP id v2so970187ggn.11 for ; Tue, 18 Oct 2011 08:13:00 -0700 (PDT) Received: by 10.223.60.73 with SMTP id o9mr4619044fah.18.1318950780296; Tue, 18 Oct 2011 08:13:00 -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 7cs49148lak; Tue, 18 Oct 2011 08:13:00 -0700 (PDT) Received: by 10.14.15.96 with SMTP id e72mr344437eee.95.1318950779504; Tue, 18 Oct 2011 08:12:59 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id c52si1777697wed.8.2011.10.18.08.12.58 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 18 Oct 2011 08:12:59 -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 1RGBLa-0008H8-Du; Tue, 18 Oct 2011 16:12:54 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Riku Voipio , =?UTF-8?q?Juha=20Riihim=C3=A4ki?= Subject: [PATCH] hw/omap2: Wire up the IRQ for the 2430's fifth GPIO module Date: Tue, 18 Oct 2011 16:12:54 +0100 Message-Id: <1318950774-31787-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 The OMAP2430 version of the omap-gpio device has five GPIO modules, not four like the other OMAP2 versions; wire up the fifth module's IRQ line correctly. Signed-off-by: Peter Maydell --- A minor issue noted by Juha; strictly this is currently unreachable code since the mpu_model is always set to omap2420, but best not to leave boobytraps in the code for later... hw/omap2.c | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/hw/omap2.c b/hw/omap2.c index 838c32f..5197fef 100644 --- a/hw/omap2.c +++ b/hw/omap2.c @@ -2409,6 +2409,11 @@ struct omap_mpu_state_s *omap2420_mpu_init(unsigned long sdram_size, qdev_get_gpio_in(s->ih[0], OMAP_INT_24XX_GPIO_BANK3)); sysbus_connect_irq(busdev, 9, qdev_get_gpio_in(s->ih[0], OMAP_INT_24XX_GPIO_BANK4)); + if (s->mpu_model == omap2430) { + sysbus_connect_irq(busdev, 12, + qdev_get_gpio_in(s->ih[0], + OMAP_INT_243X_GPIO_BANK5)); + } ta = omap_l4ta(s->l4, 3); sysbus_mmio_map(busdev, 0, omap_l4_region_base(ta, 1)); sysbus_mmio_map(busdev, 1, omap_l4_region_base(ta, 0));