From: Eric Miao <eric.y.miao@gmail.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org,
linux-arm-kernel <linux-arm-kernel@lists.infradead.org>,
Haojian Zhuang <haojian.zhuang@gmail.com>
Subject: Re: [PATCH 2/4] mmp: support ssp in pxa168
Date: Thu, 11 Mar 2010 16:20:35 +0800 [thread overview]
Message-ID: <f17812d71003110020g67bb7fd6tfe1381294b6cfe8f@mail.gmail.com> (raw)
In-Reply-To: <20100310142832.GB24422@rakim.wolfsonmicro.main>
On Wed, Mar 10, 2010 at 10:28 PM, Mark Brown
<broonie@opensource.wolfsonmicro.com> wrote:
> On Wed, Mar 10, 2010 at 08:14:42AM -0500, Haojian Zhuang wrote:
>> From 75fe4b02234f6476e72827508f11f1035d7aaf68 Mon Sep 17 00:00:00 2001
>> From: Haojian Zhuang <haojian.zhuang@marvell.com>
>> Date: Wed, 10 Mar 2010 06:32:43 -0500
>> Subject: [PATCH] [ARM] mmp: support ssp in pxa168
>>
>> Support ssp in pxa168. The basic function of SSP is same as pxa, but clock
>> source and IRQ is changed.
>>
>> Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
>
> Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
>
> That said might it make sense to merge this and the previous patch via
> ASoC since there's new drivers using this following on and Liam's
> multi-codec work is likely to be creating merge issues this development
> cycle? I can apply the patches on a branch by themselves which can also
> be pulled into the PXA tree if needed.
>
I'd expect there to be some merge conflicts I need to solve along with
my cleaning up of the SSP code. That said, it's better to go via -pxa
tree and get the multi-codec work solved in linux-next?
Mark, could you please point me the reference to the multi-codec work
so I can have a rough feeling of the possible merge issues?
- eric
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2010-03-11 8:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-10 13:14 [PATCH 2/4] mmp: support ssp in pxa168 Haojian Zhuang
2010-03-10 14:28 ` Mark Brown
2010-03-11 8:20 ` Eric Miao [this message]
2010-03-11 10:58 ` Mark Brown
2010-03-11 11:11 ` Liam Girdwood
2010-03-16 11:49 ` Eric Miao
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=f17812d71003110020g67bb7fd6tfe1381294b6cfe8f@mail.gmail.com \
--to=eric.y.miao@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=haojian.zhuang@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/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).