Messages in this thread Patch in this message | | | Date | Tue, 7 Jan 2014 14:27:59 +1100 | From | Stephen Rothwell <> | Subject | Re: linux-next: build failure after merge of the mmc tree |
| |
Hi Shawn,
On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <shawn.guo@linaro.org> 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 <sfr@canb.auug.org.au> Date: Tue, 7 Jan 2014 14:20:53 +1100 Subject: [PATCH] mmc: merge fixup for imx6qdl-sabresd.dtsi
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> --- 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/imx6qdl-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 = <MX6QDL_USDHC3_PINGRP_D8>; }; + + pinctrl_usdhc4: usdhc4grp { + fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>; + }; }; }; @@ -438,7 +438,7 @@ &usdhc4 { pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc4_1>; + pinctrl-0 = <&pinctrl_usdhc4>; bus-width = <8>; non-removable; no-1-8-v; -- Cheers, Stephen Rothwell sfr@canb.auug.org.au [unhandled content-type:application/pgp-signature] | |