On Mon, Sep 10, 2012 at 04:42:36AM -0700, Linus Walleij wrote: > On Fri, Sep 7, 2012 at 1:14 PM, Lee Jones <lee.jones@xxxxxxxxxx> 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@xxxxxxxxxxxxxxx > > CC: Wolfram Sang <w.sang@xxxxxxxxxxxxxx> > > Signed-off-by: Lee Jones <lee.jones@xxxxxxxxxx> > > The patch as such is fine. > Acked-by: Linus Walleij <linus.walleij@xxxxxxxxxx> > > ...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 <linux/pm_runtime.h> > > #include <linux/platform_data/i2c-nomadik.h> > > #include <linux/of.h> > > +#include <linux/of_i2c.h> > > 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. First, I'd like to have this patch squashed with "i2c: nomadik: Add Device Tree support to the Nomadik I2C driver". I wanted to do this on my own, but the patches do not apply to 3.6-rc5 (with or without regulator removal patch from Linus)? I can also take the I2C related changes to the devicetrees via my tree. This is not uncommon. Some people prefer to do this via their soc-trees, though. I don't care much since this is not really a hard dependency causing build failures or merge conflicts, but just needs a little extra time until the patches are all there... Thanks, Wolfram -- Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Attachment:
signature.asc
Description: Digital signature
