From patchwork Wed Sep 21 11:16:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 4216 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 CDBDD23EF9 for ; Wed, 21 Sep 2011 11:16:59 +0000 (UTC) Received: from mail-fx0-f52.google.com (mail-fx0-f52.google.com [209.85.161.52]) by fiordland.canonical.com (Postfix) with ESMTP id B2D35A189C8 for ; Wed, 21 Sep 2011 11:16:59 +0000 (UTC) Received: by mail-fx0-f52.google.com with SMTP id 23so2134859fxe.11 for ; Wed, 21 Sep 2011 04:16:59 -0700 (PDT) Received: by 10.223.94.134 with SMTP id z6mr930140fam.8.1316603819526; Wed, 21 Sep 2011 04:16:59 -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.18.198 with SMTP id y6cs122437lad; Wed, 21 Sep 2011 04:16:59 -0700 (PDT) Received: by 10.227.157.149 with SMTP id b21mr549903wbx.95.1316603818739; Wed, 21 Sep 2011 04:16:58 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [81.2.115.146]) by mx.google.com with ESMTPS id el13si3882078wbb.49.2011.09.21.04.16.58 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Sep 2011 04:16:58 -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 1R6KnQ-0003Hg-4E; Wed, 21 Sep 2011 12:16:56 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH] hw/omap1: Wire up GPIO clock Date: Wed, 21 Sep 2011 12:16:56 +0100 Message-Id: <1316603816-12601-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.2.5 Wire up the OMAP1 GPIO clock -- this fixes a hw_error() on startup with OMAP1 based machines (sx1, cheetah). Signed-off-by: Peter Maydell --- This might textually conflict with Avi's memory API batch 8; I'm posting it for review anyway so I can put it together in a pullreq with the other outstanding omap patches which I'll rebase once batch 8 is committed. hw/omap1.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/hw/omap1.c b/hw/omap1.c index 614fd31..6237b6f 100644 --- a/hw/omap1.c +++ b/hw/omap1.c @@ -3847,6 +3847,7 @@ struct omap_mpu_state_s *omap310_mpu_init(unsigned long sdram_size, s->gpio = qdev_create(NULL, "omap-gpio"); qdev_prop_set_int32(s->gpio, "mpu_model", s->mpu_model); + qdev_prop_set_ptr(s->gpio, "clk", omap_findclk(s, "arm_gpio_ck")); qdev_init_nofail(s->gpio); sysbus_connect_irq(sysbus_from_qdev(s->gpio), 0, s->irq[0][OMAP_INT_GPIO_BANK1]);