Google Groups no longer supports new Usenet posts or subscriptions. Historical content remains viewable.
Dismiss

linux-next: build failure after merge of the mmc tree

26 views
Skip to first unread message

Stephen Rothwell

unread,
Dec 12, 2013, 9:00:02 PM12/12/13
to
Hi Chris,

After merging the mmc tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/imx6dl-sabresd.dtb] Error 2
ERROR (phandle_references): Reference to non-existent node or label "pinctrl_usdhc4_1"

ERROR: Input tree has errors, aborting (use -f to force output)
make[2]: *** [arch/arm/boot/dts/imx6q-sabresd.dtb] Error 2

Caused by commit fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support").

I have used the mmc tree from next-20131212 for today.

--
Cheers,
Stephen Rothwell <s...@canb.auug.org.au>

Stephen Rothwell

unread,
Dec 16, 2013, 9:30:02 PM12/16/13
to
Hi Chris,

ping?

Dong Aisheng

unread,
Dec 16, 2013, 10:10:02 PM12/16/13
to
Hi Stephen,

Sorry, i just see this mail.
It seems the imx pinctrl dt binding has changes since Chris pick my patch.
I will fix it ASAP.

Regards
Dong Aisheng
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majo...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/

Shawn Guo

unread,
Dec 16, 2013, 10:20:02 PM12/16/13
to
Hi Chris,

Please drop fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support") from
your tree. It should go via my tree (with a rebase). Sorry, I did not
notice it early.

Shawn

Dong Aisheng

unread,
Dec 17, 2013, 3:10:03 AM12/17/13
to
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?

Regards
Dong Aisheng

Stephen Rothwell

unread,
Dec 22, 2013, 8:50:01 PM12/22/13
to
On Tue, 17 Dec 2013 13:28:38 +1100 Stephen Rothwell <s...@canb.auug.org.au> wrote:
>
> Hi Chris,
>
> ping?

ping again - I am still getting this error.

Stephen Rothwell

unread,
Jan 6, 2014, 1:30:01 AM1/6/14
to
Hi all,

On Tue, 17 Dec 2013 16:06:19 +0800 Dong Aisheng <dong...@gmail.com> 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.

Dong Aisheng

unread,
Jan 6, 2014, 1:40:02 AM1/6/14
to
Hi Shawn,

How do you suggest to fix this issue?
Can we cook a patch for it directly based on linux-next tree?

Regards
Dong Aisheng

Shawn Guo

unread,
Jan 6, 2014, 1:40:02 AM1/6/14
to
Hi Stephen,

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 <dong...@gmail.com> 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.

I'm afraid that using a working mmc tree next branch might be the only
option until Chris comes online to drop the patch from his tree.

Shawn

Shawn Guo

unread,
Jan 6, 2014, 1:50:01 AM1/6/14
to
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 <dong...@gmail.com> 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 = <MX6QDL_USDHC3_PINGRP_D8>;
};
+
+ pinctrl_usdhc4: usdhc4grp {
+ fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
+ };
};
};

Dong Aisheng

unread,
Jan 6, 2014, 1:50:02 AM1/6/14
to
On Mon, Jan 6, 2014 at 2:46 PM, Shawn Guo <shaw...@linaro.org> wrote:
> On Mon, Jan 06, 2014 at 02:30:00PM +0800, Dong Aisheng wrote:
>> Hi Shawn,
>>
>> How do you suggest to fix this issue?
>> Can we cook a patch for it directly based on linux-next tree?
>
> No, we can not. No patch should be targeting linux-next tree. I just
> gave a resolution to Stephen. Before Chris shows up and drops the patch
> from his tree, we will need to use that temp resolution.
>

Got it, thanks.

Regards
Dong Aisheng

> Shawn

Shawn Guo

unread,
Jan 6, 2014, 1:50:02 AM1/6/14
to
On Mon, Jan 06, 2014 at 02:30:00PM +0800, Dong Aisheng wrote:
> Hi Shawn,
>
> How do you suggest to fix this issue?
> Can we cook a patch for it directly based on linux-next tree?

No, we can not. No patch should be targeting linux-next tree. I just
gave a resolution to Stephen. Before Chris shows up and drops the patch
from his tree, we will need to use that temp resolution.

Shawn

Stephen Rothwell

unread,
Jan 6, 2014, 2:40:01 AM1/6/14
to
Hi Shawn,

On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <shaw...@linaro.org> wrote:
>
> 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 = <MX6QDL_USDHC3_PINGRP_D8>;
> };
> +
> + pinctrl_usdhc4: usdhc4grp {
> + fsl,pins = <MX6QDL_USDHC4_PINGRP_D8>;
> + };
> };
> };

Thanks, I will add this as a merge resolution patch tomorrow.

Stephen Rothwell

unread,
Jan 6, 2014, 10:30:01 PM1/6/14
to
Hi Shawn,

On Mon, 6 Jan 2014 14:44:08 +0800 Shawn Guo <shaw...@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 <s...@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 <s...@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;

Chris Ball

unread,
Jan 13, 2014, 12:50:02 PM1/13/14
to
Hi,

On Tue, Dec 17 2013, Shawn Guo wrote:
> Please drop fc4fafac9656 ("ARM: dts: sabresd: add usdhc4 support") from
> your tree. It should go via my tree (with a rebase). Sorry, I did not
> notice it early.

Sorry for missing this thread, everyone -- I've dropped this patch
from mmc-next now.

- Chris.
--
Chris Ball <ch...@printf.net> <http://printf.net/>
0 new messages