From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Mark Brown <broonie@opensource.wolfsonmicro.com>
Cc: alsa-devel@alsa-project.org, Benoit Cousson <b-cousson@ti.com>,
Tony Lindgren <tony@atomide.com>,
devicetree-discuss@lists.ozlabs.org,
linux-arm-kernel@lists.infradead.org, linux-omap@vger.kernel.org,
Liam Girdwood <lrg@ti.com>,
Jarkko Nikula <jarkko.nikula@bitmer.com>
Subject: Re: [PATCH v3 5/9] ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code
Date: Thu, 23 Aug 2012 11:12:46 +0300 [thread overview]
Message-ID: <5035E5FE.90401@ti.com> (raw)
In-Reply-To: <20120822191506.GL7995@opensource.wolfsonmicro.com>
Hi Mark,
On 08/22/2012 10:15 PM, Mark Brown wrote:
> Applied but this didn't quite apply cleanly, please check that it did so.
The part which removes the omap_mcbsp_6pin_src_mux() function from
sound/soc/omap/mcbsp.c is the one which did not made it.
It failed to apply on top of topic/omap is that the branch does not have the
following commit:
d0db84e ASoC: omap-mcbsp: Fix 6pin mux configuration
This patch is in your for-next branch. I can not find it in the for-3.6 or
for-3.7 branch either.
Commit d0db84e was planed to be part of 3.6 AFAIK. Without that patch in
topic/omap we are going to have merge issue with 3.7.
I can send a patch which removes the omap_mcbsp_6pin_src_mux() in topic/omap
but the patch will similarly fail when we going to have d0db84e already
applied mainline.
--
Péter
next prev parent reply other threads:[~2012-08-23 8:12 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-16 13:40 [PATCH v3 0/9] ARM/ASoC: OMAP McBSP device tree support Peter Ujfalusi
2012-08-16 13:41 ` [PATCH v3 1/9] ARM/ASoC: omap-mcbsp: Move OMAP2+ clock parenting code to ASoC driver Peter Ujfalusi
2012-08-17 13:06 ` Tony Lindgren
2012-08-22 19:10 ` Mark Brown
2012-08-16 13:41 ` [PATCH v3 2/9] ARM: OMAP: mcbsp: Enable FIFO use for OMAP2430 Peter Ujfalusi
2012-08-17 13:07 ` Tony Lindgren
2012-08-17 13:14 ` Jarkko Nikula
2012-08-17 14:03 ` Peter Ujfalusi
2012-08-18 6:08 ` Tony Lindgren
2012-08-18 15:58 ` Ujfalusi, Peter
2012-08-20 6:57 ` Tony Lindgren
2012-08-22 19:11 ` Mark Brown
2012-08-22 21:01 ` Tony Lindgren
2012-08-16 13:41 ` [PATCH v3 3/9] ARM: OMAP: board-am3517evm: Configure McBSP1 CLKR/FSR signal source Peter Ujfalusi
2012-08-17 13:07 ` Tony Lindgren
2012-08-22 19:12 ` Mark Brown
2012-08-16 13:41 ` [PATCH v3 4/9] ASoC: am3517evm: Do not configure McBSP1 CLKR/FSR signal muxing Peter Ujfalusi
2012-08-17 13:08 ` Tony Lindgren
2012-08-22 19:13 ` Mark Brown
2012-08-16 13:41 ` [PATCH v3 5/9] ARM/ASoC: omap-mcbsp: Remove CLKR/FSR mux configuration code Peter Ujfalusi
2012-08-17 13:08 ` Tony Lindgren
2012-08-22 19:15 ` Mark Brown
2012-08-23 8:12 ` Peter Ujfalusi [this message]
2012-08-16 13:41 ` [PATCH v3 6/9] ASoC: omap-mcbsp: Remove unused defines Peter Ujfalusi
2012-08-22 19:15 ` Mark Brown
2012-08-16 13:41 ` [PATCH v3 7/9] ASoC: omap-mcbsp: Remove cpu_is_omap* checks from the code Peter Ujfalusi
2012-08-22 19:15 ` Mark Brown
2012-08-16 13:41 ` [PATCH v3 8/9] ARM: OMAP2+: McBSP: Do not create legacy devices when booting with DT data Peter Ujfalusi
2012-08-17 13:09 ` Tony Lindgren
2012-08-22 19:16 ` Mark Brown
2012-08-16 13:41 ` [PATCH v3 9/9] ASoC: omap-mcbsp: Add device tree bindings Peter Ujfalusi
2012-08-22 19:16 ` Mark Brown
2012-08-17 10:18 ` [PATCH v3 0/9] ARM/ASoC: OMAP McBSP device tree support Mark Brown
2012-08-17 13:10 ` Tony Lindgren
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=5035E5FE.90401@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=b-cousson@ti.com \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=jarkko.nikula@bitmer.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=tony@atomide.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).