On Wed, Nov 14, 2012 at 06:09:08PM +0800, Bo Shen wrote: > Add pinctrl support for atmel ssc peripheral > > Signed-off-by: Bo Shen <[email protected]>
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).
signature.asc
Description: Digital signature
_______________________________________________ devicetree-discuss mailing list [email protected] https://lists.ozlabs.org/listinfo/devicetree-discuss
