From patchwork Sat Nov 30 14:36:10 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gwenhael Goavec-Merou X-Patchwork-Id: 3260771 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 3DF92BEEAD for ; Sat, 30 Nov 2013 16:34:28 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5D33920574 for ; Sat, 30 Nov 2013 16:34:27 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 663792056F for ; Sat, 30 Nov 2013 16:34:26 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VmnUA-0000Jj-UM; Sat, 30 Nov 2013 16:33:39 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VmnTu-00038P-Js; Sat, 30 Nov 2013 16:33:22 +0000 Received: from kmf.trabucayre.com ([91.121.117.161] helo=mail) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VmnTS-00036e-8k for linux-arm-kernel@lists.infradead.org; Sat, 30 Nov 2013 16:32:55 +0000 Received: from localhost.localdomain (localhost [127.0.0.1]) by mail (Postfix) with ESMTP id 7FBB839844; Sat, 30 Nov 2013 15:36:11 +0100 (CET) From: Gwenhael Goavec-Merou To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 3/3] ARM: dts: imx27-apf27dev: Add pinctrl for cspi chip-select, sdhci2 card-detect, gpio-leds and gpio-keys Date: Sat, 30 Nov 2013 15:36:10 +0100 Message-Id: <1385822170-98486-3-git-send-email-gwenhael.goavec-merou@armadeus.com> X-Mailer: git-send-email 1.6.4.2 In-Reply-To: <1385822170-98486-2-git-send-email-gwenhael.goavec-merou@armadeus.com> References: <1385822170-98486-1-git-send-email-gwenhael.goavec-merou@armadeus.com> <1385822170-98486-2-git-send-email-gwenhael.goavec-merou@armadeus.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131130_113254_489974_5B2EFE5F X-CRM114-Status: UNSURE ( 8.21 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -1.2 (-) Cc: devicetree@vger.kernel.org, shawn.guo@linaro.org, Gwenhael Goavec-Merou , Sascha Hauer X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Gwenhael Goavec-Merou --- arch/arm/boot/dts/imx27-apf27dev.dts | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/arch/arm/boot/dts/imx27-apf27dev.dts b/arch/arm/boot/dts/imx27-apf27dev.dts index 6069331..c8d3cb4 100644 --- a/arch/arm/boot/dts/imx27-apf27dev.dts +++ b/arch/arm/boot/dts/imx27-apf27dev.dts @@ -38,6 +38,8 @@ gpio-keys { compatible = "gpio-keys"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_keys>; user-key { label = "user"; @@ -48,6 +50,8 @@ leds { compatible = "gpio-leds"; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_gpio_leds>; user { label = "Heartbeat"; @@ -61,7 +65,7 @@ fsl,spi-num-chipselects = <1>; cs-gpios = <&gpio4 28 1>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_cspi1>; + pinctrl-0 = <&pinctrl_cspi1 &pinctrl_cspi1_cs>; status = "okay"; }; @@ -70,7 +74,7 @@ cs-gpios = <&gpio4 21 1>, <&gpio4 27 1>, <&gpio2 17 1>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_cspi2>; + pinctrl-0 = <&pinctrl_cspi2 &pinctrl_cspi2_cs>; status = "okay"; }; @@ -106,10 +110,22 @@ fsl,pins = ; }; + pinctrl_cspi1_cs: cspi1csgrp { + fsl,pins = ; + }; + pinctrl_cspi2: cspi2grp { fsl,pins = ; }; + pinctrl_cspi2_cs: cspi2csgrp { + fsl,pins = < + MX27_PAD_CSI_D5__GPIO2_17 0x0 + MX27_PAD_CSPI2_SS0__GPIO4_21 0x0 + MX27_PAD_CSPI1_SS1__GPIO4_27 0x0 + >; + }; + pinctrl_imxfb1: imxfbgrp { fsl,pins = ; }; @@ -126,9 +142,21 @@ fsl,pins = ; }; + pinctrl_sdhc2_cd: sdhc2cdgrp { + fsl,pins = ; + }; + pinctrl_pwm0: pwm0grp { fsl,pins = ; }; + + pinctrl_gpio_leds: gpioledsgrp { + fsl,pins = ; + }; + + pinctrl_gpio_keys: gpiokeysgrp { + fsl,pins = ; + }; }; }; @@ -136,7 +164,7 @@ bus-width = <4>; cd-gpios = <&gpio3 14 0>; pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_sdhc2>; + pinctrl-0 = <&pinctrl_sdhc2 &pinctrl_sdhc2_cd>; status = "okay"; };