On Sat, 2013-12-14 at 20:06 +0100, Arnd Bergmann wrote: > On Friday 13 December 2013, Sergei Ianovich wrote: > > Non-dts implementation supply required DMA channel numbers as > > IORESOURCE_DMA. However, there is was no way to get them from > > device tree. > > Please update this changeset comment, I think it still refers to > the earlier version. --- Non-dts implementation supply required DMA channel numbers as IORESOURCE_DMA. We can also get them from the device tree, if it is present. --- Is this fine? Should I post v3, if so? > > Signed-off-by: Sergei Ianovich <ynvich@xxxxxxxxx> > > CC: Daniel Mack <zonque@xxxxxxxxx> > > CC: Arnd Bergmann <arnd@xxxxxxxx> > > The patch looks ok in case we are merging your patches for 3.14 > and Daniel's patches later than that. If they end up in the > same merge window however, we'd have to be care to resolve > the obvious conflict in a proper way. The most recently published Daniel's patch (Aug 2013) wraps IORESOURCE_DMA handling on DT presence in a similar way, but doesn't do any actual DT processing. So there is no conflict at the moment. Daniel can comment better on this, though. -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html