On 16/05/2014 at 16:26:35 -0700, Olof Johansson wrote : > On Wed, May 07, 2014 at 07:39:35PM +0200, Nicolas Ferre wrote: > > There is a little conflict with at91-3.16-dt that you already pulled in > > arm-soc: here is the branch that resolves it: > > > > https://github.com/at91linux/linux-at91/commits/at91-3.16-resolved > > That resolution looks odd. Why is one clock under clocks { } and two of them > are at the top level? Shouldn't they all be under the clocks subnode? > > I've merged in now with your resolution, but I think this needs revisiting. >
Actually, all the clocks should end up at the root, please refer to: http://lists.infradead.org/pipermail/linux-arm-kernel/2014-March/240219.html I feel that was one of the topics we should have discussed at ELC but we ended up talking about DT ABI stability instead... -- Alexandre Belloni, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/