On Fri, Nov 16, 2012 at 10:43:15AM +0800, Bo Shen wrote: > On 11/16/2012 9:03, Mark Brown wrote:
> >This generates lots of conflicts in the pinctrl stuff in the DTS - looks > >like it was generated against -next. Can you please regenerate against > >my atmel branch with just the changes to add the pinmux information on > >the SSC nodes? Or possbily this can just be applied direct to the > >pinctrl branch (we'll get an add/add conflict with the SSC nodes though > >that should be simple to resolve, a cross merge might be helpful). > As Mark suggested, would this patch be split into 2 patches? One is > for atmel ssc add pinmux information go into ASoC tree, and the > other add ssc node into dts file go into pinctrl tree. Would this be > ok? It's more of an either/or thing but the two patches would be OK, then we can work out which to apply.
signature.asc
Description: Digital signature
_______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
