From patchwork Wed Nov 5 06:59:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Olof Johansson X-Patchwork-Id: 5232571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 65BB59F2ED for ; Wed, 5 Nov 2014 07:01:34 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D987B20155 for ; Wed, 5 Nov 2014 07:01:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (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 4B18020103 for ; Wed, 5 Nov 2014 07:01:27 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1XluXD-0000QS-Vk; Wed, 05 Nov 2014 06:57:39 +0000 Received: from mail-pa0-f47.google.com ([209.85.220.47]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XluXA-0000An-U9 for linux-arm-kernel@lists.infradead.org; Wed, 05 Nov 2014 06:57:37 +0000 Received: by mail-pa0-f47.google.com with SMTP id kx10so190798pab.6 for ; Tue, 04 Nov 2014 22:57:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=+c5jeGTHqSkzFa2A4Kxzc+O2EVnxTTjjeMhDJ30f5NY=; b=MRVw/XFDlpAD5M+PWS4QqpYYznp1hndI0rLHb/LYydZvVHRla4pJjnfkSrpaXUN74y LPryDvqC4pjOZKhedHCB7g83iolAUE7q+vin5BGlqnP3h5P1H+Dg4n3o70+NNd+Vy5DB /6wTwJ+X4onNcLWLRdk4WSboE7qH1H6G06Fq1t4tCwOHSWrRw+RLDDURv5HEyYrv/AhL aybbgw5SPhGqfZv83hOFX0dge6hfD1NDLnnwF/4ZvH7E6XM+NRtMEDXVVytvux4+02X5 nwyELzvOxZGoPAv+jXF+fCN2Ktwu80DZoSBwfnP/hwsd4GjXEvwixj0biWS2bJw4ieE7 lDtA== X-Gm-Message-State: ALoCoQmTDgYjAOmTwhS0ND8Zf+5ZLxzXHt65nDMF/50Wspy+0HdvJOn6s68WCh1zl/d5aumG1rx9 X-Received: by 10.70.48.202 with SMTP id o10mr3587128pdn.63.1415170634690; Tue, 04 Nov 2014 22:57:14 -0800 (PST) Received: from brutus.lixom.net (173-13-129-225-sfba.hfc.comcastbusiness.net. [173.13.129.225]) by mx.google.com with ESMTPSA id r3sm2176136pds.57.2014.11.04.22.57.12 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 04 Nov 2014 22:57:13 -0800 (PST) From: Olof Johansson To: shawn.guo@linaro.org Subject: [PATCH] ARM: dts: vf610: add SD node to cosmic dts Date: Tue, 4 Nov 2014 22:59:25 -0800 Message-Id: <1415170765-3343-1-git-send-email-olof@lixom.net> X-Mailer: git-send-email 1.7.10.4 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20141104_225736_988897_BE9C1338 X-CRM114-Status: GOOD ( 11.48 ) X-Spam-Score: -0.7 (/) Cc: linux-arm-kernel@lists.infradead.org, Olof Johansson , stefan@agner.ch, kernel@pengutronix.de, Matt Porter X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 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=-2.5 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_NONE, 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 Driver has been there since a while back, but the dts never seems to have been updated with the node (nor pinctrl). Do so now. Cc: Matt Porter Signed-off-by: Olof Johansson Acked-by: Shawn Guo Acked-by: Stefan Agner --- Shawn, Stefan: This probably has some small conflicts with Stefan's patchsets that refactors some of the dts contents for 3.19. I'd like to pick this patch up as a fix for 3.18 though, since it makes my Cosmic+ board usable for the boot farm. If that'd be OK (i.e. to apply Stefan's patches on top of this), please ack so I can include it with the next set of fixes. :) Thanks, -Olof arch/arm/boot/dts/vf610-cosmic.dts | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/arch/arm/boot/dts/vf610-cosmic.dts b/arch/arm/boot/dts/vf610-cosmic.dts index 3fd1b74..c1b8355 100644 --- a/arch/arm/boot/dts/vf610-cosmic.dts +++ b/arch/arm/boot/dts/vf610-cosmic.dts @@ -56,6 +56,19 @@ >; }; + pinctrl_esdhc1: esdhc1grp { + fsl,pins = < + VF610_PAD_PTA24__ESDHC1_CLK 0x31ef + VF610_PAD_PTA25__ESDHC1_CMD 0x31ef + VF610_PAD_PTA26__ESDHC1_DAT0 0x31ef + VF610_PAD_PTA27__ESDHC1_DAT1 0x31ef + VF610_PAD_PTA28__ESDHC1_DATA2 0x31ef + VF610_PAD_PTA29__ESDHC1_DAT3 0x31ef + VF610_PAD_PTB28__GPIO_98 0x219d + >; + }; + + pinctrl_uart1: uart1grp { fsl,pins = < VF610_PAD_PTB4__UART1_TX 0x21a2 @@ -70,3 +83,10 @@ pinctrl-0 = <&pinctrl_uart1>; status = "okay"; }; + +&esdhc1 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_esdhc1>; + bus-width = <4>; + status = "okay"; +};