From patchwork Thu Aug 8 16:04:08 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18897 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-yh0-f71.google.com (mail-yh0-f71.google.com [209.85.213.71]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 62DE925E79 for ; Thu, 8 Aug 2013 16:04:33 +0000 (UTC) Received: by mail-yh0-f71.google.com with SMTP id f64sf3815920yha.6 for ; Thu, 08 Aug 2013 09:04:33 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=mime-version:x-gm-message-state:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=UAZHKc1lr/dnZoWTqBPwFfknblJ4gfua2aR1OqquA20=; b=jksFHpy6DQgfm2oTGBUlM2Onb8wK7JonpDf2hEghJWaU75YsO8goY+/nPDHkuuEOnZ a7HYfXWcXS2qZx3PAlYJaKslvu+NIcPu2pyyFOXXIujm0vsBFxsWmA0/fqYfc5PtsYF1 QP4vClY2TmOZV7/jARCC9VVe98wVZCBWhNXL8EGAgtsszmBs3HGMBsvFOdDXs9U0CKdJ OP6y273WzjGo2GGv0rgFwKIMlOgs9SlWCZ+xcBYaZKieL+6QF2oInppXd/7mC83cb8ri Xw+B5ujUpgNhrIC/ziKRMJYB+BWQBIXsFc9bgCqAATl4Td/KBftxO1WlEj7vxWaxtnNo rUig== X-Received: by 10.236.163.166 with SMTP id a26mr841929yhl.22.1375977873126; Thu, 08 Aug 2013 09:04:33 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.105.3 with SMTP id gi3ls860405qeb.81.gmail; Thu, 08 Aug 2013 09:04:33 -0700 (PDT) X-Received: by 10.220.182.193 with SMTP id cd1mr4492268vcb.32.1375977873005; Thu, 08 Aug 2013 09:04:33 -0700 (PDT) Received: from mail-vb0-f42.google.com (mail-vb0-f42.google.com [209.85.212.42]) by mx.google.com with ESMTPS id ae9si3279698vdc.80.2013.08.08.09.04.32 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:32 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.212.42; Received: by mail-vb0-f42.google.com with SMTP id e12so3344937vbg.1 for ; Thu, 08 Aug 2013 09:04:32 -0700 (PDT) X-Gm-Message-State: ALoCoQkFClz0lU0qgyr5etRDEOK3UWVVIc559rB2fRduA9/0JDWSCWCcnuw15HpPy9YjdIHKrTK3 X-Received: by 10.58.6.210 with SMTP id d18mr3418402vea.96.1375977872809; Thu, 08 Aug 2013 09:04:32 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.220.174.196 with SMTP id u4csp23552vcz; Thu, 8 Aug 2013 09:04:32 -0700 (PDT) X-Received: by 10.68.164.1 with SMTP id ym1mr7053208pbb.33.1375977869478; Thu, 08 Aug 2013 09:04:29 -0700 (PDT) Received: from mnementh.archaic.org.uk (1.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.0.d.1.0.0.b.8.0.1.0.0.2.ip6.arpa. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id to1si10146232pab.196.2013.08.08.09.04.28 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:29 -0700 (PDT) Received-SPF: neutral (google.com: 2001:8b0:1d0::1 is neither permitted nor denied by best guess record for domain of pm215@archaic.org.uk) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1V7ShF-0006Wo-Ep; Thu, 08 Aug 2013 17:04:17 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 06/14] hw/arm/kzm: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:08 +0100 Message-Id: <1375977856-25046-7-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> References: <1375977856-25046-1-git-send-email-peter.maydell@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.42 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , Drop the now-deprecated arm_pic_init_cpu() in favour of directly getting the IRQ line from the ARMCPU object. Signed-off-by: Peter Maydell --- hw/arm/kzm.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/hw/arm/kzm.c b/hw/arm/kzm.c index bd6c05c..a248bf0 100644 --- a/hw/arm/kzm.c +++ b/hw/arm/kzm.c @@ -82,7 +82,6 @@ static void kzm_init(QEMUMachineInitArgs *args) MemoryRegion *ram = g_new(MemoryRegion, 1); MemoryRegion *sram = g_new(MemoryRegion, 1); MemoryRegion *ram_alias = g_new(MemoryRegion, 1); - qemu_irq *cpu_pic; DeviceState *dev; DeviceState *ccm; @@ -108,11 +107,10 @@ static void kzm_init(QEMUMachineInitArgs *args) memory_region_init_ram(sram, NULL, "kzm.sram", 0x4000); memory_region_add_subregion(address_space_mem, 0x1FFFC000, sram); - cpu_pic = arm_pic_init_cpu(cpu); dev = sysbus_create_varargs("imx_avic", 0x68000000, - cpu_pic[ARM_PIC_CPU_IRQ], - cpu_pic[ARM_PIC_CPU_FIQ], NULL); - + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_IRQ), + qdev_get_gpio_in(DEVICE(cpu), ARM_CPU_FIQ), + NULL); imx_serial_create(0, 0x43f90000, qdev_get_gpio_in(dev, 45)); imx_serial_create(1, 0x43f94000, qdev_get_gpio_in(dev, 32));