From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753091AbaAFGn2 (ORCPT ); Mon, 6 Jan 2014 01:43:28 -0500 Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:18215 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750909AbaAFGn0 (ORCPT ); Mon, 6 Jan 2014 01:43:26 -0500 X-Forefront-Antispam-Report: CIP:70.37.183.190;KIP:(null);UIP:(null);IPV:NLI;H:mail.freescale.net;RD:none;EFVD:NLI X-SpamScore: -3 X-BigFish: VS-3(zz98dI1432I14ffIzz1f42h2148h208ch1ee6h1de0h1fdah2073h2146h1202h1e76h2189h1d1ah1d2ah1fc6hzz1de098h8275bh1de097hz2dh87h2a8h839h944hd25hf0ah1220h1288h12a5h12a9h12bdh137ah13b6h1441h1504h1537h153bh162dh1631h1758h18e1h1946h19b5h1ad9h1b0ah1b2fh2222h224fh1fb3h1d0ch1d2eh1d3fh1dfeh1dffh1fe8h1ff5h209eh2216h22d0h2336h1151h1155h) X-FB-DOMAIN-IP-MATCH: fail Date: Mon, 6 Jan 2014 14:44:08 +0800 From: Shawn Guo To: Stephen Rothwell CC: Dong Aisheng , Chris Ball , , "linux-kernel@vger.kernel.org" , Dong Aisheng Subject: Re: linux-next: build failure after merge of the mmc tree Message-ID: <20140106064406.GD26128@S2101-09.ap.freescale.net> References: <20131213125716.f432c59bf8782a489400a5a7@canb.auug.org.au> <20131217132838.cc16a4dbac2f4d3218bbed1d@canb.auug.org.au> <20131217031600.GG6691@S2101-09.ap.freescale.net> <20140106172243.8067c8e72c666511129a9701@canb.auug.org.au> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Disposition: inline In-Reply-To: <20140106172243.8067c8e72c666511129a9701@canb.auug.org.au> User-Agent: Mutt/1.5.21 (2010-09-15) X-OriginatorOrg: sigmatel.com X-FOPE-CONNECTOR: Id%0$Dn%*$RO%0$TLS%0$FQDN%$TlsDn% X-FOPE-CONNECTOR: Id%0$Dn%FREESCALE.MAIL.ONMICROSOFT.COM$RO%1$TLS%0$FQDN%$TlsDn% Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jan 06, 2014 at 05:22:43PM +1100, Stephen Rothwell wrote: > Hi all, > > On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng wrote: > > > > I tested that Chris tree does not have problem. > > It's caused by IMX tree updates. > > > > Chris, > > Is the way Shawn suggested OK for you? > > Can we have some resolution of this please? This failed to build again > today so I have used the version of the mmc tree from next-20131212 > again. I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but > that didn't work. Okay, I missed your point. The resolution needs the additional changes as below. Shawn diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 91e5dd4..8b05648 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -356,6 +356,10 @@ pinctrl_usdhc3: usdhc3grp { fsl,pins = ; }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins = ; + }; }; }; From mboxrd@z Thu Jan 1 00:00:00 1970 From: Shawn Guo Subject: Re: linux-next: build failure after merge of the mmc tree Date: Mon, 6 Jan 2014 14:44:08 +0800 Message-ID: <20140106064406.GD26128@S2101-09.ap.freescale.net> References: <20131213125716.f432c59bf8782a489400a5a7@canb.auug.org.au> <20131217132838.cc16a4dbac2f4d3218bbed1d@canb.auug.org.au> <20131217031600.GG6691@S2101-09.ap.freescale.net> <20140106172243.8067c8e72c666511129a9701@canb.auug.org.au> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Return-path: Received: from va3ehsobe001.messaging.microsoft.com ([216.32.180.11]:18215 "EHLO va3outboundpool.messaging.microsoft.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750909AbaAFGn0 (ORCPT ); Mon, 6 Jan 2014 01:43:26 -0500 Content-Disposition: inline In-Reply-To: <20140106172243.8067c8e72c666511129a9701@canb.auug.org.au> Sender: linux-next-owner@vger.kernel.org List-ID: To: Stephen Rothwell Cc: Dong Aisheng , Chris Ball , linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org" , Dong Aisheng On Mon, Jan 06, 2014 at 05:22:43PM +1100, Stephen Rothwell wrote: > Hi all, > > On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng wrote: > > > > I tested that Chris tree does not have problem. > > It's caused by IMX tree updates. > > > > Chris, > > Is the way Shawn suggested OK for you? > > Can we have some resolution of this please? This failed to build again > today so I have used the version of the mmc tree from next-20131212 > again. I tried the obvious fix (s/pinctrl_usdhc4_1/pinctrl_usdhc4/) but > that didn't work. Okay, I missed your point. The resolution needs the additional changes as below. Shawn diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi index 91e5dd4..8b05648 100644 --- a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi +++ b/arch/arm/boot/dts/imx6qdl-sabresd.dtsi @@ -356,6 +356,10 @@ pinctrl_usdhc3: usdhc3grp { fsl,pins = ; }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins = ; + }; }; };