From patchwork Mon Jun 11 15:25:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 9204 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 B1CAB23EB4 for ; Mon, 11 Jun 2012 15:25:47 +0000 (UTC) Received: from mail-yw0-f52.google.com (mail-yw0-f52.google.com [209.85.213.52]) by fiordland.canonical.com (Postfix) with ESMTP id 7D996A186CC for ; Mon, 11 Jun 2012 15:25:47 +0000 (UTC) Received: by mail-yw0-f52.google.com with SMTP id p61so2858474yhp.11 for ; Mon, 11 Jun 2012 08:25:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf:from:to:cc :subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=wIb4C6ZTwkjA8c2v1Exh3hgMi1lehHzchi2e1b+CmFI=; b=YC0uiC9hbKrzcrrXv1bUOlNCbIzhuPz2Ka0naUlAtnsLnD6EfLsBJN9fyM9xQtQ2Ug SP29EpDqojCxviqDMq+KsN/QhkzlstYt+wXBDP74NdRHiR2NHXRqF+ZEbiII7C7BC4o7 bWexvy7zWqG8d7WoLJScUSp+mcrdTSR1hGiEI05+fIV4EXQL6Beg0EOCRxjyxZB8YN0a +vLc3FYkaHyXpYKMT1GqCFCCNvspH3X+DPQShhFE0/VX0IX2f0BTGVDY0rhC85+uvJiX lUTetpMqhp0y2NaWa5V6GERkyv8qeIiSljd3cPyLcLDQ0qJCuJrIQVzch5uUoiityRpR NwJg== Received: by 10.50.163.99 with SMTP id yh3mr6495622igb.53.1339428347035; Mon, 11 Jun 2012 08:25:47 -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.231.24.148 with SMTP id v20csp115746ibb; Mon, 11 Jun 2012 08:25:46 -0700 (PDT) Received: by 10.14.189.12 with SMTP id b12mr5540880een.140.1339428345517; Mon, 11 Jun 2012 08:25:45 -0700 (PDT) Received: from mail-wi0-f178.google.com (mail-wi0-f178.google.com [209.85.212.178]) by mx.google.com with ESMTPS id eu2si16955643wib.8.2012.06.11.08.25.45 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 08:25:45 -0700 (PDT) Received-SPF: neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=209.85.212.178; Authentication-Results: mx.google.com; spf=neutral (google.com: 209.85.212.178 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) smtp.mail=lee.jones@linaro.org Received: by mail-wi0-f178.google.com with SMTP id hn6so2491211wib.13 for ; Mon, 11 Jun 2012 08:25:45 -0700 (PDT) Received: by 10.180.97.3 with SMTP id dw3mr21726776wib.19.1339428345026; Mon, 11 Jun 2012 08:25:45 -0700 (PDT) Received: from localhost.localdomain (cpc1-aztw13-0-0-cust473.18-1.cable.virginmedia.com. [77.102.241.218]) by mx.google.com with ESMTPS id ch9sm39413606wib.8.2012.06.11.08.25.43 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 11 Jun 2012 08:25:44 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linus.walleij@stericsson.com, arnd@arndb.de, grant.likely@secretlab.ca, Lee Jones Subject: [PATCH 12/14] ARM: ux500: Correctly reference IRQs supplied by the AB8500 from Device Tree Date: Mon, 11 Jun 2012 16:25:05 +0100 Message-Id: <1339428307-3850-13-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1339428307-3850-1-git-send-email-lee.jones@linaro.org> References: <1339428307-3850-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQlKiDSwq8TNytMDnkg53E0wQdkBn6l4bNG9cuHcKSw/aFw+OUa6KrcH2pXH8jSk1BkSWInk The AB8500 driver has now been provided with IRQ domain support. This means we can request IRQs from any of it's uses via Device Tree. This patch advertises the AB8500 as an Interrupt Controller and provides the correct calls in the format the driver expects. Signed-off-by: Lee Jones --- arch/arm/boot/dts/db8500.dtsi | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/arch/arm/boot/dts/db8500.dtsi b/arch/arm/boot/dts/db8500.dtsi index 01f9a9d..55a36ae 100644 --- a/arch/arm/boot/dts/db8500.dtsi +++ b/arch/arm/boot/dts/db8500.dtsi @@ -312,24 +312,26 @@ compatible = "stericsson,ab8500"; reg = <5>; /* mailbox 5 is i2c */ interrupts = <0 40 0x4>; + interrupt-controller; + #interrupt-cells = <2>; ab8500-gpadc { compatible = "stericsson,ab8500-gpadc"; - interrupts = <0 32 0x4 - 0 39 0x4>; + interrupts = <32 0x4 + 39 0x4>; interrupt-names = "HW_CONV_END", "SW_CONV_END"; vddadc-supply = <&ab8500_ldo_tvout_reg>; }; ab8500-usb { compatible = "stericsson,ab8500-usb"; - interrupts = < 0 90 0x4 - 0 96 0x4 - 0 14 0x4 - 0 15 0x4 - 0 79 0x4 - 0 74 0x4 - 0 75 0x4>; + interrupts = < 90 0x4 + 96 0x4 + 14 0x4 + 15 0x4 + 79 0x4 + 74 0x4 + 75 0x4>; interrupt-names = "ID_WAKEUP_R", "ID_WAKEUP_F", "VBUS_DET_F", @@ -344,8 +346,8 @@ ab8500-ponkey { compatible = "stericsson,ab8500-ponkey"; - interrupts = <0 6 0x4 - 0 7 0x4>; + interrupts = <6 0x4 + 7 0x4>; interrupt-names = "ONKEY_DBF", "ONKEY_DBR"; };