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: 1421551 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id C45ED3FC33 for ; Fri, 7 Sep 2012 11:23:43 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1T9wav-0005vy-MD; Fri, 07 Sep 2012 11:19:32 +0000 Received: from mail-wi0-f177.google.com ([209.85.212.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1T9wX9-0003cs-GN for linux-arm-kernel@lists.infradead.org; Fri, 07 Sep 2012 11:15:36 +0000 Received: by mail-wi0-f177.google.com with SMTP id hn17so1922122wib.0 for ; Fri, 07 Sep 2012 04:15:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=/lN+123OowyOBtXnoDzE9khOwfJiwum0T2MqvsOccE8=; b=pnRqxio82I2wDQgkLLdbHmDoMEGrnDIm5kDvRRCSHrvLShvlFi9XGGCj3m6EmgP+JA nz23bJBt9svkYFuaLCpNGcKgwKeVixjKe1+J0FLvDuugbXeek2vGHv7cSjEK9MECz4Mf Y14156JpimnF2Q4DfayOdqu9RLouMXYmlteKa0rZXgDGeL7pQS4gpdKXPYI/sRk4O61H kzgx58jRkWmjjJHG8lJoX46fnaWCzIBmIdKRJ/D0peSEUj40zXX38ethyFwnGcS6fJ9G kG7TEXDNtFqQxromr4sQn+vXzYGAO0wnJa+jP8d7lZZ5oDv8YGLAbwrIEdOiuU2dPJDX RPrQ== 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 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: ALoCoQm1LUj+5I/wyGLa1g1HkQgBn/vvjYxL2hSaR4IteokycYWW8MryqcKHTuAZRXqPpMw0sBSd X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [209.85.212.177 listed in list.dnswl.org] -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: STEricsson_nomadik_linux@list.st.com, Lee Jones , linus.walleij@stericsson.com, arnd@arndb.de X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org 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 Acked-by: Linus Walleij --- 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";