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 13:48:01 +0900 [thread overview]
Message-ID: <20121116044758.GO4387@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <50A5A843.2060902@atmel.com>
[-- Attachment #1: Type: text/plain, Size: 855 bytes --]
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.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
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 04:48:01 +0000 [thread overview]
Message-ID: <20121116044758.GO4387@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <50A5A843.2060902@atmel.com>
[-- Attachment #1: Type: text/plain, Size: 855 bytes --]
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.
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
WARNING: multiple messages have this Message-ID (diff)
From: broonie@opensource.wolfsonmicro.com (Mark Brown)
To: linux-arm-kernel@lists.infradead.org
Subject: [Patch v6 1/4] ARM: at91: atmel-ssc: add pinctrl support
Date: Fri, 16 Nov 2012 13:48:01 +0900 [thread overview]
Message-ID: <20121116044758.GO4387@opensource.wolfsonmicro.com> (raw)
In-Reply-To: <50A5A843.2060902@atmel.com>
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.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20121116/9be1c5b7/attachment.sig>
next prev parent reply other threads:[~2012-11-16 4:48 UTC|newest]
Thread overview: 43+ 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 ` Bo Shen
2012-11-14 10:09 ` Bo Shen
2012-11-14 10:09 ` [Patch v6 1/4] ARM: at91: atmel-ssc: add pinctrl support Bo Shen
2012-11-14 10:09 ` Bo Shen
2012-11-14 10:09 ` Bo Shen
2012-11-16 1:03 ` Mark Brown
2012-11-16 1:03 ` Mark Brown
2012-11-16 1:03 ` Mark Brown
2012-11-16 2:43 ` Bo Shen
2012-11-16 2:43 ` Bo Shen
2012-11-16 2:43 ` Bo Shen
2012-11-16 4:48 ` Mark Brown [this message]
2012-11-16 4:48 ` Mark Brown
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-14 10:09 ` Bo Shen
2012-11-14 10:09 ` Bo Shen
2012-11-16 1:25 ` Mark Brown
2012-11-16 1:25 ` Mark Brown
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-14 10:09 ` Bo Shen
2012-11-14 10:09 ` Bo Shen
2012-11-16 1:26 ` Mark Brown
2012-11-16 1:26 ` Mark Brown
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-14 10:09 ` Bo Shen
2012-11-14 10:09 ` Bo Shen
2012-11-16 1:28 ` Mark Brown
2012-11-16 1:28 ` Mark Brown
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-26 21:23 ` Arnd Bergmann
2012-11-26 21:23 ` Arnd Bergmann
2012-11-27 2:54 ` Bo Shen
2012-11-27 2:54 ` Bo Shen
2012-11-27 2:54 ` Bo Shen
2012-11-27 8:44 ` Arnd Bergmann
2012-11-27 8:44 ` Arnd Bergmann
2012-11-27 10:01 ` Mark Brown
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=20121116044758.GO4387@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.