From: Mark Brown <broonie@opensource.wolfsonmicro.com>
To: Bo Shen <voice.shen@atmel.com>
Cc: plagnioj@jcrosoft.com, nicolas.ferre@atmel.com,
linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org, linux-sound@vger.kernel.org,
alsa-devel@alsa-project.org
Subject: Re: [Patch v6 1/4] ARM: at91: atmel-ssc: add pinctrl support
Date: Fri, 16 Nov 2012 10:03:11 +0900 [thread overview]
Message-ID: <20121116010310.GG4387@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <1352887751-21848-2-git-send-email-voice.shen@atmel.com>
[-- Attachment #1: Type: text/plain, Size: 589 bytes --]
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 <voice.shen@atmel.com>
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).
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
next prev parent reply other threads:[~2012-11-16 1:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-14 10:09 [Patch v6 0/4] ASoC: atmel-ssc: Add pinctrl support and change register method Bo Shen
2012-11-14 10:09 ` [Patch v6 1/4] ARM: at91: atmel-ssc: add pinctrl support Bo Shen
2012-11-16 1:03 ` Mark Brown [this message]
2012-11-16 2:43 ` Bo Shen
2012-11-16 4:48 ` Mark Brown
2012-11-14 10:09 ` [Patch v6 2/4] ASoC: atmel-ssc-dai: register dai and pcm directly Bo Shen
2012-11-16 1:25 ` Mark Brown
2012-11-14 10:09 ` [Patch v6 3/4] ASoC: atmel-ssc-dai: match new method of dai and pcm register Bo Shen
2012-11-16 1:26 ` Mark Brown
2012-11-14 10:09 ` [Patch v6 4/4] ASoC: at91sam9g20ek-wm8731: convert to dt support Bo Shen
2012-11-16 1:28 ` Mark Brown
[not found] ` <1352887751-21848-5-git-send-email-voice.shen-AIFe0yeh4nAAvxtiuMwx3w@public.gmane.org>
2012-11-26 21:23 ` Arnd Bergmann
2012-11-27 2:54 ` Bo Shen
2012-11-27 8:44 ` Arnd Bergmann
2012-11-27 10:01 ` Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121116010310.GG4387@opensource.wolfsonmicro.com \
--to=broonie@opensource.wolfsonmicro.com \
--cc=alsa-devel@alsa-project.org \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sound@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
--cc=voice.shen@atmel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).