From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759123Ab2INIWY (ORCPT ); Fri, 14 Sep 2012 04:22:24 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:39340 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758123Ab2INIWS (ORCPT ); Fri, 14 Sep 2012 04:22:18 -0400 Date: Fri, 14 Sep 2012 09:22:12 +0100 From: Lee Jones To: Linus Walleij Cc: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, STEricsson_nomadik_linux@list.st.com, linus.walleij@stericsson.com, arnd@arndb.de, linux-i2c@vger.kernel.org, Wolfram Sang Subject: Re: [PATCH 12/19] i2c-nomadik: Register sub-devices when passed via Device Tree Message-ID: <20120914082210.GD3374@gmail.com> References: <1347016499-29354-1-git-send-email-lee.jones@linaro.org> <1347016499-29354-13-git-send-email-lee.jones@linaro.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Sep 10, 2012 at 04:42:36AM -0700, Linus Walleij wrote: > On Fri, Sep 7, 2012 at 1:14 PM, Lee Jones wrote: > > > Each I2C device can be correctly probed already using Device Tree, > > but the sub-devices still have to be registered by calls to > > i2c_register_board_info(). After this patch, each sub-device can > > be registered directly from Device Tree instead, removing the > > requirement for the aforementioned calls from platform code. > > > > CC: linux-i2c@vger.kernel.org > > CC: Wolfram Sang > > Signed-off-by: Lee Jones > > The patch as such is fine. > Acked-by: Linus Walleij > > ...but there will be merge issues (of the type I'm > discussing with Arnd in another thread). > > > --- > > drivers/i2c/busses/i2c-nomadik.c | 4 ++++ > > 1 file changed, 4 insertions(+) > > > > diff --git a/drivers/i2c/busses/i2c-nomadik.c b/drivers/i2c/busses/i2c-nomadik.c > > index 5d1a970..01231c2 100644 > > --- a/drivers/i2c/busses/i2c-nomadik.c > > +++ b/drivers/i2c/busses/i2c-nomadik.c > > @@ -26,6 +26,7 @@ > > #include > > #include > > #include > > +#include > > This is clearly dependent on the other patches to I2C to > be merged first (the include above is not yet there in > linux-next even), so this patch should go into Wolfram's > tree right? Else we have to rip out all the patches to the > I2C driver from his tree and funnel it all through ARM SoC. > > With the changes to the device tree itself being dependent > on this, they should thus also go through the I2C tree. > > But they may be heavily dependent on the other DT > changes you've done, so they cannot be applied to > Wolfram's tree... > > And thus you may need to hold this change off > until the I2C changes are upstream, or start creating > cross-tree dependencies. > > Maybe I shouldn't worry about these things and just > ACK stuff, but I have such problems with cross-tree > merges myself so just trying to be helpful :-/ If I send all my stuff though arm-soc, then I have no dependencies at all. All my patches are based on the latest -rc. It seems a little silly to split them all up and push them through lots of different trees. That way we're bound to increase the chances of merge conflicts surely? -- Lee Jones Linaro ST-Ericsson Landing Team Lead Linaro.org │ Open source software for ARM SoCs Follow Linaro: Facebook | Twitter | Blog