From patchwork Fri Sep 7 11:14:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 11247 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 DD70023FA6 for ; Fri, 7 Sep 2012 11:15:37 +0000 (UTC) Received: from mail-ie0-f180.google.com (mail-ie0-f180.google.com [209.85.223.180]) by fiordland.canonical.com (Postfix) with ESMTP id 314B5A19654 for ; Fri, 7 Sep 2012 11:15:37 +0000 (UTC) Received: by mail-ie0-f180.google.com with SMTP id k11so4488374iea.11 for ; Fri, 07 Sep 2012 04:15:37 -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=/lN+123OowyOBtXnoDzE9khOwfJiwum0T2MqvsOccE8=; b=oH+QK+4UHtM4NyWjiC5Q3yU7R9F5YPmlAkd1EeP2lG7ivWTLIhcw+6DwlbNCIzMfwQ ajyHoIHRQPTiraEGvfrnGMYc+pag+YsD6gj/yBoJubiRUruqQzI9ThgjX1vHrEiWFpQt rVKpl6tYhhrs/yWhyUjUMFUBbMzzjY71IMMs4G/oQL+9VmbJYu6V7zH/FD9RozeUnMLl GdENe8i1Lx9eOyrcGYW0hKFSMPLZ87RGRKJ66qqycbKE4pG/NFE2GRgZWuMSSIFDtvfL ggXK+gqnecvsuhC9mMRsdTYdMlqbYY9LUqLmfLKopqOeQrd+QQKWW17Tvy5moT1PTxb7 A0NQ== Received: by 10.50.45.162 with SMTP id o2mr8167880igm.0.1347016536969; Fri, 07 Sep 2012 04:15:36 -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.50.184.232 with SMTP id ex8csp373458igc; Fri, 7 Sep 2012 04:15:36 -0700 (PDT) Received: by 10.180.95.193 with SMTP id dm1mr52446441wib.10.1347016535638; Fri, 07 Sep 2012 04:15:35 -0700 (PDT) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx.google.com with ESMTPS id fj1si12702359wib.21.2012.09.07.04.15.35 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 04:15:35 -0700 (PDT) Received-SPF: neutral (google.com: 74.125.82.50 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=74.125.82.50; Authentication-Results: mx.google.com; spf=neutral (google.com: 74.125.82.50 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-wg0-f50.google.com with SMTP id ds11so2271205wgb.31 for ; Fri, 07 Sep 2012 04:15:35 -0700 (PDT) Received: by 10.180.97.135 with SMTP id ea7mr52444863wib.11.1347016535183; Fri, 07 Sep 2012 04:15:35 -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 k20sm9151505wiv.11.2012.09.07.04.15.33 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 07 Sep 2012 04:15:34 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, Lee Jones Subject: [PATCH 14/19] ARM: ux500: Apply tc3589x's GPIO/IRQ properties to HREF's DT Date: Fri, 7 Sep 2012 12:14:54 +0100 Message-Id: <1347016499-29354-15-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> References: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQktHJwt8WwBi0IPYmC8hWJoG3rgQiqD4zooNAOFy2wMVVMcBFZRAdtXONOuS5G4BqARWmeA This patch ensures the tc3589x and tc3598x-gpio devices are rightfully given interrupt controller status. We also describe the tc3598x-gpio GPIO expander in full and specify it as a GPIO controller. Finally we reference that the external MMC slot's Card Detection GPIO on the HREF is located on the tc3598x-gpio expander. Signed-off-by: Lee Jones --- arch/arm/boot/dts/hrefv60plus.dts | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/arch/arm/boot/dts/hrefv60plus.dts b/arch/arm/boot/dts/hrefv60plus.dts index ec9ec4f..b3290c7 100644 --- a/arch/arm/boot/dts/hrefv60plus.dts +++ b/arch/arm/boot/dts/hrefv60plus.dts @@ -42,7 +42,7 @@ mmc-cap-mmc-highspeed; vmmc-supply = <&ab8500_ldo_aux3_reg>; - cd-gpios = <&gpio2 31 0x4>; // 95 + cd-gpios = <&tc3589x_gpio 3 0x4>; status = "okay"; }; @@ -100,6 +100,21 @@ tc3589x@42 { compatible = "tc3589x"; reg = <0x42>; + interrupt-parent = <&gpio6>; + interrupts = <25 0x1>; + + interrupt-controller; + #interrupt-cells = <2>; + + tc3589x_gpio: tc3589x_gpio { + compatible = "tc3589x-gpio"; + interrupts = <0 0x1>; + + interrupt-controller; + #interrupt-cells = <2>; + gpio-controller; + #gpio-cells = <2>; + }; }; tps61052@33 { compatible = "tps61052";