Re: [GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window

[Tony Lindgren <tony@atomide.com>]

* Kevin Hilman <khilman@linaro.org> [131018 07:49]:
> Hi Tony,
> 
> Tony Lindgren <tony@atomide.com> writes:
> 
> > The following changes since commit f41509ad0d4c11d0911630440749d409ce2aa1aa:
> >
> >   Merge branches 'omap-for-v3.13/dt' and 'omap-for-v3.13/quirk' into omap-for-v3.13/board-removal (2013-10-14 11:33:07 -0700)
> >
> > are available in the git repository at:
> >
> >
> >   git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.13/board-removal-signed
> >
> > for you to fetch changes up to f0c09b7c3b4e6b2fe501b3e888797b470de8320c:
> >
> >   ARM: OMAP2+: Remove legacy support for zoom platforms (2013-10-15 17:38:21 -0700)
> >
> > ----------------------------------------------------------------
> > Changes needed to drop legacy booting support for some
> > omap3 boards.
> >
> > Note that that these are based on a merge of the
> > following for the dependencies:
> >
> > - v3.12-rc5 for fixes to pinctrl mask
> > - omap-for-v3.13/dt-signed to avoid pointless merge conflicts
> > - omap-for-v3.13/quirk-signed for legacy pdata handling
> >
> > ----------------------------------------------------------------
> > Aaro Koskinen (2):
> >       ARM: dts: add minimal DT support for Nokia N950 & N9 phones
> >       ARM: OMAP2: delete board-rm680
> >
> > Tony Lindgren (6):
> >       ARM: dts: Shared file for omap GPMC connected smsc911x
> >       ARM: dts: Add common support for omap3-evm
> >       ARM: dts: Add basic support for TMDSEVM3730 (Mistral AM/DM37x EVM)
> >       ARM: dts: Add basic support for zoom3
> 
> This patch introduces a build failure when compiling the DTBs:
> 
>   [...]
>   DTC     arch/arm/boot/dts/omap3-zoom3.dtb
> ERROR (phandle_references): Reference to non-existent node or label "wl12xx_gpio"

Oops sorry, looks like the common support for omap3-evm has a
pinctrl entry that should be in the omap3-evm-37xx only. I guess
I did not run make dtbs after adding the omap3-evm-37xx parts.
The patch below fixes it for me.

Do you want a new pull request or just the fix below?

Regards,

Tony

8< -----------------------------------------
From: Tony Lindgren <tony@atomide.com>
Date: Fri, 18 Oct 2013 08:16:25 -0700
Subject: [PATCH] ARM: dts: Fix build error for omap3-evm after adding common file

Commit c4856107 ((ARM: dts: Add basic support for TMDSEVM3730
(Mistral AM/DM37x EVM)) added a pinctrl entry to the common file
for evm that should be only in the omap3-evm-37xx. This causes:

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

Fix it by moving the entry to omap3-evm-37xx.

Reported-by: Kevin Hilman <khilman@linaro.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

--- a/arch/arm/boot/dts/omap3-evm-37xx.dts
+++ b/arch/arm/boot/dts/omap3-evm-37xx.dts
@@ -19,6 +19,11 @@
 		device_type = "memory";
 		reg = <0x80000000 0x10000000>; /* 256 MB */
 	};
+
+	wl12xx_vmmc: wl12xx_vmmc {
+		pinctrl-names = "default";
+		pinctrl-0 = <&wl12xx_gpio>;
+	};
 };
 
 &omap3_pmx_core {
--- a/arch/arm/boot/dts/omap3-evm-common.dtsi
+++ b/arch/arm/boot/dts/omap3-evm-common.dtsi
@@ -21,8 +21,6 @@
 	};
 
 	wl12xx_vmmc: wl12xx_vmmc {
-		pinctrl-names = "default";
-		pinctrl-0 = <&wl12xx_gpio>;
 		compatible = "regulator-fixed";
 		regulator-name = "vwl1271";
 		regulator-min-microvolt = <1800000>;