Hi J,

On 11/16/2012 9:03, Mark Brown wrote:

On Wed, Nov 14, 2012 at 06:09:08PM +0800, Bo Shen wrote:

quoted

Add pinctrl support for atmel ssc peripheral

Signed-off-by: Bo Shen <redacted>

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?

Thanks.

Best Regards,
Bo Shen