From mboxrd@z Thu Jan 1 00:00:00 1970 From: Tony Lindgren Subject: Re: [GIT PULL] ARM: OMAP: Device Tree for 3.13 Date: Fri, 11 Oct 2013 14:42:01 -0700 Message-ID: <20131011214201.GZ29913@atomide.com> References: <52582A67.6050108@baylibre.com> <20131011180324.GV29913@atomide.com> <52584BF7.8060100@baylibre.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Return-path: Content-Disposition: inline In-Reply-To: <52584BF7.8060100@baylibre.com> Sender: linux-omap-owner@vger.kernel.org To: Benoit Cousson Cc: "linux-omap@vger.kernel.org" , linux-arm-kernel , "devicetree@vger.kernel.org" List-Id: devicetree@vger.kernel.org * Benoit Cousson [131011 12:13]: > Hi Tony, > > On 11/10/2013 20:03, Tony Lindgren wrote: > >Hi Benoit, > > > >* Benoit Cousson [131011 09:50]: > >>Add the minimal DTS support for DRA7xx based SoC core. > >>Add the initial support for N900 and gta04 phones. > >>Enable USB3 on OMAP5 evm board. > >>Add support for cryto accelerators > >>Add new IGEP AQUILA board > >>Add AM33XX EDMA support > >>Update HSUSB node to use the reset-gpios fmwk > > > >Looks good to me, but we're getting self-inflicted merge > >conflicts in two places now with Paul's hwmod changes, > >and my defconfig changes. > > Damn! :) > >Can you please respin without the following two patches: > > > >49bcd824c1c0db32fe4de0c1ba3ee36defdb11ca ARM: configs: omap2plus_defconfig: enable dwc3 and dependencies > >736c4bb159c793b00331261438deb982cbac3c03 ARM: OMAP5: hwmod: add missing ocp2scp hwmod data > > > >I can pick the two patches above and apply after pulling in > >Paul's branch first. > > OK, no problem. > > > > >However, if other branches are based on this, then we just > >need to deal with the merge conflicts, and there's no point > >in redoing your branch. > > Considering the patches, I don't see any dependency with the other > ones, as soon as they are pulled before the DTS changes. > > I'll do that ASAP and repost. OK thanks! I'll cherry pick the above two commits then. Tony