From patchwork Thu Aug 8 16:04:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 18895 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-vb0-f70.google.com (mail-vb0-f70.google.com [209.85.212.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id A4F8125D87 for ; Thu, 8 Aug 2013 16:04:31 +0000 (UTC) Received: by mail-vb0-f70.google.com with SMTP id h10sf3705002vbh.1 for ; Thu, 08 Aug 2013 09:04:31 -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=caqZCEhM5KHGl64jTY7TnN0ZbHxePtCJ3NrpV0XvwWc=; b=ELfbB2pMAanbExGTVmZZct/4G5nN05cbKNEP5c7pEXavwdf8s+Ggok4u4NmFFb2YpG OVOtKYJ/1xUG1jAx8vvAAJvWPH/s7/BhKN5hmCIutIFOlyHXITpfm78c7tdxPwp0c38J EFc2rXHOkJcubYzoHfj6iPsMHLL81b1aV0yRv4HDaCX1XLZj7/GNkG0lHPh7diAkUm68 ZR1eFk2FDLmruP2Jmj7QisMwav4Movx70rSnJ7PpEBAJleEJpf1809lBj+EGSlCYqvm9 33o9PpsSBN37ZFqPLE15QNxzfCT5ftKbBy8QruCm+Gti95Ma5PSZ+g5i0ZEZFB6Y4dPT UvXg== X-Received: by 10.236.147.50 with SMTP id s38mr3571263yhj.44.1375977871366; Thu, 08 Aug 2013 09:04:31 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.12.79 with SMTP id w15ls1105247qeb.96.gmail; Thu, 08 Aug 2013 09:04:31 -0700 (PDT) X-Received: by 10.52.64.179 with SMTP id p19mr2941588vds.92.1375977871266; Thu, 08 Aug 2013 09:04:31 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id u7si3279176vcn.112.2013.08.08.09.04.31 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:31 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.220.181 is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id hz10so255097vcb.26 for ; Thu, 08 Aug 2013 09:04:31 -0700 (PDT) X-Gm-Message-State: ALoCoQmem2SCTNC57aUEYmn1aMEleMTexXa9B77G3QAm+JmAN7xFJ/eqiejhkXIzbVdVk7RdebrG X-Received: by 10.221.47.193 with SMTP id ut1mr4392214vcb.8.1375977871177; Thu, 08 Aug 2013 09:04:31 -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 u4csp23548vcz; Thu, 8 Aug 2013 09:04:30 -0700 (PDT) X-Received: by 10.205.39.196 with SMTP id tn4mr1538769bkb.183.1375977868374; Thu, 08 Aug 2013 09:04:28 -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 nl6si2328475bkb.92.2013.08.08.09.04.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 08 Aug 2013 09:04:28 -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 1V7ShG-0006XM-2q; Thu, 08 Aug 2013 17:04:18 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH 10/14] hw/arm/strongarm: Don't use arm_pic_init_cpu() Date: Thu, 8 Aug 2013 17:04:12 +0100 Message-Id: <1375977856-25046-11-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.220.181 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/strongarm.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hw/arm/strongarm.c b/hw/arm/strongarm.c index 82a9492..7b8ef8c 100644 --- a/hw/arm/strongarm.c +++ b/hw/arm/strongarm.c @@ -1588,7 +1588,6 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, unsigned int sdram_size, const char *rev) { StrongARMState *s; - qemu_irq *pic; int i; s = g_malloc0(sizeof(StrongARMState)); @@ -1613,9 +1612,10 @@ StrongARMState *sa1110_init(MemoryRegion *sysmem, vmstate_register_ram_global(&s->sdram); memory_region_add_subregion(sysmem, SA_SDCS0, &s->sdram); - pic = arm_pic_init_cpu(s->cpu); s->pic = sysbus_create_varargs("strongarm_pic", 0x90050000, - pic[ARM_PIC_CPU_IRQ], pic[ARM_PIC_CPU_FIQ], NULL); + qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_IRQ), + qdev_get_gpio_in(DEVICE(s->cpu), ARM_CPU_FIQ), + NULL); sysbus_create_varargs("pxa25x-timer", 0x90000000, qdev_get_gpio_in(s->pic, SA_PIC_OSTC0),