From patchwork Fri Oct 18 15:24:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tony Lindgren X-Patchwork-Id: 3068441 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A3A37BF924 for ; Fri, 18 Oct 2013 15:26:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EC3C5203E9 for ; Fri, 18 Oct 2013 15:26:08 +0000 (UTC) Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8C3F120396 for ; Fri, 18 Oct 2013 15:26:07 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXBvp-0008Js-Hs; Fri, 18 Oct 2013 15:25:41 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXBvi-0007Nx-VH; Fri, 18 Oct 2013 15:25:35 +0000 Received: from mho-02-ewr.mailhop.org ([204.13.248.72]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1VXBvV-0007Ky-Am for linux-arm-kernel@lists.infradead.org; Fri, 18 Oct 2013 15:25:22 +0000 Received: from c-50-131-214-131.hsd1.ca.comcast.net ([50.131.214.131] helo=localhost.localdomain) by mho-02-ewr.mailhop.org with esmtpa (Exim 4.72) (envelope-from ) id 1VXBv5-000MKp-Mo; Fri, 18 Oct 2013 15:24:56 +0000 Received: from Mutt by mutt-smtp-wrapper.pl 1.2 (www.zdo.com/articles/mutt-smtp-wrapper.shtml) X-Mail-Handler: Dyn Standard SMTP by Dyn X-Originating-IP: 50.131.214.131 X-Report-Abuse-To: abuse@dyndns.com (see http://www.dyndns.com/services/sendlabs/outbound_abuse.html for abuse reporting information) X-MHO-User: U2FsdGVkX19JZLHXhKzSHIOnLtnfR2Qp Date: Fri, 18 Oct 2013 08:24:50 -0700 From: Tony Lindgren To: Kevin Hilman Subject: Re: [GIT PULL 1/2] omap board removal for some omap3 boards for v3.13 merge window Message-ID: <20131018152450.GI15154@atomide.com> References: <526041db.41abe00a.33b7.00a1SMTPIN_ADDED_BROKEN@mx.google.com> <87hacews6o.fsf@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <87hacews6o.fsf@linaro.org> User-Agent: Mutt/1.5.20 (2009-06-14) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20131018_112521_390121_5D0C94D5 X-CRM114-Status: GOOD ( 21.94 ) X-Spam-Score: -1.9 (-) Cc: Olof Johansson , linux-omap@vger.kernel.org, arm@kernel.org, linux-arm-kernel@lists.infradead.org, Arnd Bergmann X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-4.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP * Kevin Hilman [131018 07:49]: > Hi Tony, > > Tony Lindgren 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 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 Signed-off-by: Tony Lindgren --- 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>;