linux-next.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Shawn Guo <shawn.guo@linaro.org>
Cc: Dong Aisheng <dongas86@gmail.com>, Chris Ball <cjb@laptop.org>,
	linux-next@vger.kernel.org,
	"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
	Dong Aisheng <b29396@freescale.com>
Subject: Re: linux-next: build failure after merge of the mmc tree
Date: Tue, 7 Jan 2014 14:27:59 +1100	[thread overview]
Message-ID: <20140107142759.abeb12cd3748ecd3284f20a6@canb.auug.org.au> (raw)
In-Reply-To: <20140106064406.GD26128@S2101-09.ap.freescale.net>

[-- Attachment #1: Type: text/plain, Size: 1261 bytes --]

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

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

  parent reply	other threads:[~2014-01-07  3:28 UTC|newest]

Thread overview: 56+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-13  1:57 linux-next: build failure after merge of the mmc tree Stephen Rothwell
2013-12-17  2:28 ` Stephen Rothwell
2013-12-17  3:07   ` Dong Aisheng
2013-12-17  3:16     ` Shawn Guo
2013-12-17  8:06       ` Dong Aisheng
2014-01-06  6:22         ` Stephen Rothwell
2014-01-06  6:30           ` Dong Aisheng
2014-01-06  6:46             ` Shawn Guo
2014-01-06  6:46               ` Dong Aisheng
2014-01-06  6:30           ` Shawn Guo
2014-01-06  6:44           ` Shawn Guo
2014-01-06  7:29             ` Stephen Rothwell
2014-01-07  3:27             ` Stephen Rothwell [this message]
2014-01-13 17:49       ` Chris Ball
2013-12-23  1:40   ` Stephen Rothwell
  -- strict thread matches above, loose matches on Subject: below --
2023-06-09  1:34 Stephen Rothwell
2023-06-09  6:10 ` Wenbin Mei (梅文彬)
2023-05-10  1:18 Stephen Rothwell
2023-05-10  2:26 ` Jakub Kicinski
2023-05-11 10:54 ` Ulf Hansson
2021-04-16  3:48 Stephen Rothwell
2021-04-16  3:49 ` Stephen Rothwell
2021-04-26  1:31   ` Stephen Rothwell
2021-04-26  9:46     ` Ulf Hansson
2020-10-06  5:29 Stephen Rothwell
2020-09-25  4:40 Stephen Rothwell
2020-06-02  3:44 Stephen Rothwell
2020-06-02 12:05 ` Ulf Hansson
2020-06-02 12:15 ` Kalle Valo
2020-05-18  4:27 Stephen Rothwell
2020-05-18  6:10 ` Martin Blumenstingl
2018-02-15  0:49 Stephen Rothwell
2018-02-15  5:29 ` Kishon Vijay Abraham I
2014-05-30  3:23 Stephen Rothwell
2014-06-02  9:31 ` Ulf Hansson
     [not found]   ` <20140602214039.10062.15077@quantum>
2014-06-02 21:43     ` Chris Ball
2014-05-26  4:07 Stephen Rothwell
2014-06-02  5:11 ` Stephen Rothwell
2014-06-03 22:52   ` Stephen Rothwell
2014-06-04 19:21     ` Chris Ball
2014-06-05  2:57       ` Chris Ball
2014-05-23  5:32 Stephen Rothwell
2014-05-23  8:45 ` Sebastian Hesselbarth
2014-04-22  3:06 Stephen Rothwell
2014-04-22  4:57 ` Seungwon Jeon
2014-04-22  8:40 ` Ulf Hansson
2014-04-22 11:10   ` Chris Ball
2011-11-09  1:06 Stephen Rothwell
2011-11-09  1:35 ` Chris Ball
2011-09-22  6:13 Stephen Rothwell
2011-09-22 11:56 ` Chris Ball
2011-07-16  9:30 Stephen Rothwell
2011-07-18 22:29 ` Per Forlin
2011-03-28  2:10 Stephen Rothwell
2010-10-25  1:12 Stephen Rothwell
2010-10-25  2:21 ` Chris Ball

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20140107142759.abeb12cd3748ecd3284f20a6@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=b29396@freescale.com \
    --cc=cjb@laptop.org \
    --cc=dongas86@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=shawn.guo@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).