From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [GIT PULL 2/2] omap overo related device tree changes for v3.15 Date: Mon, 17 Mar 2014 15:18:43 +0100 Message-ID: <201403171518.43389.arnd@arndb.de> References: <20140313200135.GA5981@atomide.com> <20140313200253.GB5981@atomide.com> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: Received: from moutng.kundenserver.de ([212.227.17.10]:49714 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933099AbaCQOSw (ORCPT ); Mon, 17 Mar 2014 10:18:52 -0400 In-Reply-To: <20140313200253.GB5981@atomide.com> Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Tony Lindgren Cc: arm@kernel.org, linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org On Thursday 13 March 2014, Tony Lindgren wrote: > The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691: > > Linux 3.14-rc4 (2014-02-23 17:40:03 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-overo-signed > > for you to fetch changes up to 28b191118c11719bb27db621425a70be28a40e08: > > ARM: dts: Add support for the Overo Summit (2014-03-12 10:21:16 -0700) > > ---------------------------------------------------------------- > Updates to the .dts files to support more Gumstix boards. > > These are sent separately from the rest of the .dts changes > as these depend on the fixes merged into v3.14-rc4, and > needed a bit more time to get updated on the fixes. Pulled into next/dt, thanks! I had a trivial merge conflict in omap3-overo.dtsi that I resolved as below. Arnd diff --cc arch/arm/boot/dts/omap3-overo.dtsi index b08142f,c37b130..69ca7c4 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi @@@ -91,11 -33,3 +33,6 @@@ }; }; - &uart3 { - pinctrl-names = "default"; - pinctrl-0 = <&uart3_pins>; - }; - +&mcbsp2 { + status = "okay"; +}; From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Mon, 17 Mar 2014 15:18:43 +0100 Subject: [GIT PULL 2/2] omap overo related device tree changes for v3.15 In-Reply-To: <20140313200253.GB5981@atomide.com> References: <20140313200135.GA5981@atomide.com> <20140313200253.GB5981@atomide.com> Message-ID: <201403171518.43389.arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org On Thursday 13 March 2014, Tony Lindgren wrote: > The following changes since commit cfbf8d4857c26a8a307fb7cd258074c9dcd8c691: > > Linux 3.14-rc4 (2014-02-23 17:40:03 -0800) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap tags/omap-for-v3.15/dt-overo-signed > > for you to fetch changes up to 28b191118c11719bb27db621425a70be28a40e08: > > ARM: dts: Add support for the Overo Summit (2014-03-12 10:21:16 -0700) > > ---------------------------------------------------------------- > Updates to the .dts files to support more Gumstix boards. > > These are sent separately from the rest of the .dts changes > as these depend on the fixes merged into v3.14-rc4, and > needed a bit more time to get updated on the fixes. Pulled into next/dt, thanks! I had a trivial merge conflict in omap3-overo.dtsi that I resolved as below. Arnd diff --cc arch/arm/boot/dts/omap3-overo.dtsi index b08142f,c37b130..69ca7c4 --- a/arch/arm/boot/dts/omap3-overo.dtsi +++ b/arch/arm/boot/dts/omap3-overo.dtsi @@@ -91,11 -33,3 +33,6 @@@ }; }; - &uart3 { - pinctrl-names = "default"; - pinctrl-0 = <&uart3_pins>; - }; - +&mcbsp2 { + status = "okay"; +};