From patchwork Fri Jul 27 11:38:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 143032 Delivered-To: patches@linaro.org Received: by 2002:a2e:9754:0:0:0:0:0 with SMTP id f20-v6csp708709ljj; Fri, 27 Jul 2018 04:38:57 -0700 (PDT) X-Google-Smtp-Source: AAOMgpfdoNLsog2uHosqHSO1HUsFH0g5FWG/ohEO5RZaLw+jfgPRzZxfDk35i9PB0c6dsI8RdgNK X-Received: by 2002:a1c:b584:: with SMTP id e126-v6mr4489960wmf.136.1532691537334; Fri, 27 Jul 2018 04:38:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1532691537; cv=none; d=google.com; s=arc-20160816; b=KEiYCiF8j2k52eRTZJRuDwfiMczImk1iLRXor+QJ3slX/s74QKy6DyABPPdXd9BIyn 8d4tVyEZQF+VGKqtIwEwUlgA3ZvX9hwigILUttPYY3DBBY8djdJURtBPAq9csPvuWOp6 m3z/QZDB5ahYh5r9vZECk8UORvTniTAgUTbKZwCvrr0w5ysW7ulgtUGv72p2oV40no4i QXGByezMN4yzNxJvXkNMwtfYvOMWWueh5oW79QfSClmShaSZpC9ftMHA76f9pRTxiU7t oW2dRATro/4hTkrqg4Qqdik0Ni3YL+HZfrDE4wTqkOEUxrCup44a+osTZqyEUly+YclA ieKg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=ZFCeoPtcEdUt1Tv+0fBhQ3OdZ4WYUau2tv5lZ+/Q3Sw=; b=f8mQk+Wd9cGGdKfw/krh5GUZ+fzbUO+GiDOzQktOEBhSz0iNtqc/pW7ewLxpHAQvko 3G1VOKR0tWAf992boUr8K6s0Pghwa/iffRbLstN0PKfeWZg7Y3mUX+cXk4m/jShSkw9U MZW8nfW/Wk8Cbt0nk6wE0xZNEHcysG58iqs3TkxR9uT7GQweNgyWQCeE3NobAjeeEdi3 etcg80c3D8rh+5a3/LqRg50rCgbJoP550zN+KLE2dUeWUmRnAdqDzYldVE7dnqNBxmUQ mnWgIkaNpf+Y4nP8AHVW/SdyMZgibx8BNCs/A6b9v0shZjn0/ST5Uye16jkaJmYD46eX PI2Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by mx.google.com with ESMTPS id l8-v6si2861717wrq.409.2018.07.27.04.38.57 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 27 Jul 2018 04:38:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) client-ip=2001:8b0:1d0::2; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::2 as permitted sender) smtp.mailfrom=pm215@archaic.org.uk; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from pm215 by orth.archaic.org.uk with local (Exim 4.89) (envelope-from ) id 1fj15E-0002GR-Rq; Fri, 27 Jul 2018 12:38:56 +0100 From: Peter Maydell To: qemu-arm@nongnu.org, qemu-devel@nongnu.org Cc: patches@linaro.org Subject: [PATCH for-3.0 2/2] hw/arm/iotkit: Fix IRQ number for timer1 Date: Fri, 27 Jul 2018 12:38:54 +0100 Message-Id: <20180727113854.20283-3-peter.maydell@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180727113854.20283-1-peter.maydell@linaro.org> References: <20180727113854.20283-1-peter.maydell@linaro.org> A cut-and-paste error meant we were incorrectly wiring up the timer1 IRQ to IRQ3. IRQ3 is the interrupt for timer0 -- move timer0 to IRQ4 where it belongs. Signed-off-by: Peter Maydell --- hw/arm/iotkit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Philippe Mathieu-Daudé diff --git a/hw/arm/iotkit.c b/hw/arm/iotkit.c index c76d3ed7435..8cadc8b1608 100644 --- a/hw/arm/iotkit.c +++ b/hw/arm/iotkit.c @@ -382,7 +382,7 @@ static void iotkit_realize(DeviceState *dev, Error **errp) return; } sysbus_connect_irq(SYS_BUS_DEVICE(&s->timer1), 0, - qdev_get_gpio_in(DEVICE(&s->armv7m), 3)); + qdev_get_gpio_in(DEVICE(&s->armv7m), 4)); mr = sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->timer1), 0); object_property_set_link(OBJECT(&s->apb_ppc0), OBJECT(mr), "port[1]", &err); if (err) {