From mboxrd@z Thu Jan 1 00:00:00 1970 From: Stephen Rothwell Subject: Re: linux-next: build failure after merge of the mmc tree Date: Tue, 7 Jan 2014 14:27:59 +1100 Message-ID: <20140107142759.abeb12cd3748ecd3284f20a6@canb.auug.org.au> 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> <20140106064406.GD26128@S2101-09.ap.freescale.net> Mime-Version: 1.0 Content-Type: multipart/signed; protocol="application/pgp-signature"; micalg="PGP-SHA256"; boundary="Signature=_Tue__7_Jan_2014_14_27_59_+1100_ZAvw9rTzgqu1mkZ4" Return-path: Received: from ozlabs.org ([203.10.76.45]:55817 "EHLO ozlabs.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754974AbaAGD2I (ORCPT ); Mon, 6 Jan 2014 22:28:08 -0500 In-Reply-To: <20140106064406.GD26128@S2101-09.ap.freescale.net> Sender: linux-next-owner@vger.kernel.org List-ID: To: Shawn Guo Cc: Dong Aisheng , Chris Ball , linux-next@vger.kernel.org, "linux-kernel@vger.kernel.org" , Dong Aisheng --Signature=_Tue__7_Jan_2014_14_27_59_+1100_ZAvw9rTzgqu1mkZ4 Content-Type: text/plain; charset=US-ASCII Content-Disposition: inline Content-Transfer-Encoding: quoted-printable Hi Shawn, On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo wrote: > > Okay, I missed your point. The resolution needs the additional changes > as below. Thanks, I applied the following as a merge fix patch today and will carry it as necessary. From: Stephen Rothwell Date: Tue, 7 Jan 2014 14:20:53 +1100 Subject: [PATCH] mmc: merge fixup for imx6qdl-sabresd.dtsi Signed-off-by: Stephen Rothwell --- arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/boot/dts/imx6qdl-sabresd.dtsi b/arch/arm/boot/dts/imx= 6qdl-sabresd.dtsi index 0eab66ea2009..0eb5704f2850 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 =3D ; }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins =3D ; + }; }; }; =20 @@ -438,7 +438,7 @@ =20 &usdhc4 { pinctrl-names =3D "default"; - pinctrl-0 =3D <&pinctrl_usdhc4_1>; + pinctrl-0 =3D <&pinctrl_usdhc4>; bus-width =3D <8>; non-removable; no-1-8-v; --=20 Cheers, Stephen Rothwell sfr@canb.auug.org.au --Signature=_Tue__7_Jan_2014_14_27_59_+1100_ZAvw9rTzgqu1mkZ4 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.22 (GNU/Linux) iQIcBAEBCAAGBQJSy3RFAAoJEMDTa8Ir7ZwV7VEP/3RntVsI7dmQqaek3lTzuQj8 wvvwhyab8IwCX8+XzxZyuwqTU7z6dhooq8A7kxKWejxFku2LBFw/cm4TAZ5QecFJ OXvP31A6uryEMRt/E7t2D/hm57Iy45v1s7iptROe9zVNE6HGFyCYUFLioIDsWZCU gX8ENmecvW4BymjEVKOIkmXGike1Q7xarc5chYaWj5Ds8TKnYuOCRx8B0AjdS7tK fwN3PS2zziZBtJoeov4OM//hqT+ky5Oe7cyusIzdnz6s/Njtl2yh8l6DFhIreDMQ fSwgxVhiJ3wHnazcsX37hKMr2IicZRciCPj/NR8NtIbqMnjZwLk1wDsUrZt1P/WE zQfNyIBe1ANCnxGfQlR0VaJ0VTMmXi8P/AQoN2TObIZ1cAOSAzVi+s6SM4Yb7UEz buhUW48VUIcZ+JAKvuXnHNSsgxQsbezQ1BhKvFaFhEKZxaHa+7z7hf3rkqnq4oxr 80LEwbOWu0bs90XHNVtKSYSVhXnL8X8B5kpOXAmzr5AWFNR/V7v6GiL9fyelTktB mv6SY6pO3nsWij7vpS78SJ48xzfVeiIelCbkF5Okl47d3OMNKkxQfPELz9ptjyjb Awv9XUxltDuyy2iau2bdw82ioQMtk9rcrnbqwxWMLqE5uh/3ziqljVGQFWapkDnU j19YPOZNkmAOtGOLBQ1D =c7xi -----END PGP SIGNATURE----- --Signature=_Tue__7_Jan_2014_14_27_59_+1100_ZAvw9rTzgqu1mkZ4--