From mboxrd@z Thu Jan 1 00:00:00 1970 From: Arnd Bergmann Subject: Re: [PATCH REPOST 1/2] arm/dt: Tegra: Update SDHCI nodes to match bindings Date: Tue, 20 Sep 2011 23:01:56 +0200 Message-ID: <201109202301.56983.arnd@arndb.de> References: <1316537186-26753-1-git-send-email-swarren@nvidia.com> <20110920180731.GL7781@ponder.secretlab.ca> <201109202134.50242.arnd@arndb.de> Mime-Version: 1.0 Content-Type: Text/Plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <201109202134.50242.arnd@arndb.de> Sender: linux-mmc-owner@vger.kernel.org To: Grant Likely Cc: Stephen Warren , nicolas.pitre@linaro.org, Shawn Guo , devicetree-discuss@lists.ozlabs.org, linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, Olof Johansson , Chris Ball , linux-arm-kernel@lists.infradead.org List-Id: linux-tegra@vger.kernel.org On Tuesday 20 September 2011, Arnd Bergmann wrote: > On Tuesday 20 September 2011, Grant Likely wrote: > > On Tue, Sep 20, 2011 at 07:43:29PM +0200, Arnd Bergmann wrote: > > > On Tuesday 20 September 2011, Stephen Warren wrote: > > > > The bindings were recently updated to have separate properties for each > > > > type of GPIO. Update the Device Tree source to match that. > > > > > > > > Signed-off-by: Stephen Warren > > > > Acked-by: Olof Johansson > > > > --- > > > > I'd previously sent these to Grant assuming they'd go in his dt/next branch, > > > > but perhaps these should go in through Arnd's arm-soc next/dt branch? > > > > > > > > > > Which tree has the update that changed the bindings? I think it should > > > go into the same one. > > > > > > If it's already upstream, I can take it into the fixes branch. > > > > Already upstream > > Ok, I see. I've applied both patches to the fixes branch and will send > it out with the next pull request for 3.1 to Linus then. Sorry, I just noticed that the second patch is not a bug fix, so I took it out again and kept only patch 1/2 in the fixes branch for 3.1. Should I take the other one as well? It's probably better to let that go the proper way through the tegra tree for 3.2, right? Arnd