From: Tony Lindgren <tony@atomide.com>
To: Peter Ujfalusi <peter.ujfalusi@ti.com>
Cc: Liam Girdwood <lrg@ti.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Misael Lopez Cruz <misael.lopez@ti.com>,
alsa-devel@alsa-project.org, linux-omap@vger.kernel.org
Subject: Re: [PATCH 05/10] OMAP4: 4430sdp: Register platform device for OMAP4 audio
Date: Wed, 14 Dec 2011 10:00:46 -0800 [thread overview]
Message-ID: <20111214180045.GZ32251@atomide.com> (raw)
In-Reply-To: <1323856022-24053-6-git-send-email-peter.ujfalusi@ti.com>
Hi,
* Peter Ujfalusi <peter.ujfalusi@ti.com> [111214 01:17]:
> To avoid breakage in audio support with the coming change
> in ASoC machine driver (conversion to platfrom device).
>
> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
This series looks OK to me to queue via the ASoC tree:
Acked-by: Tony Lindgren <tony@atomide.com>
To avoid merge conflicts, you should base the branch on commit
deee6d5359969a0ce4e2760cfd7b9f379bd5698a (ARM: 7194/1: OMAP:
Fix build after a merge between v3.2-rc4 and ARM restart changes)
in Russell's devel-stable branch because of the common.h changes.
This is because at least..
> --- a/arch/arm/mach-omap2/board-4430sdp.c
> +++ b/arch/arm/mach-omap2/board-4430sdp.c
> @@ -25,6 +25,7 @@
> #include <linux/regulator/fixed.h>
> #include <linux/leds.h>
> #include <linux/leds_pwm.h>
> +#include <linux/platform_data/omap-abe-twl6040.h>
>
> #include <mach/hardware.h>
> #include <mach/omap4-common.h>
..omap4-common.h no longer exists. Just guessing, might
be worth trying a test merge to see what happens.
Regards,
Tony
next prev parent reply other threads:[~2011-12-14 18:00 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-12-14 9:46 [PATCH 00/10] OMAP4: ASoC: Support for PandaBoard family Peter Ujfalusi
2011-12-14 9:46 ` [PATCH 01/10] ASoC: sdp4430: Correct author e-mail address Peter Ujfalusi
2011-12-14 10:06 ` Mark Brown
2011-12-14 9:46 ` [PATCH 02/10] ASoC: OMAP4: Rename the sdp4430 machine driver Peter Ujfalusi
2011-12-14 10:22 ` Mark Brown
2011-12-14 9:46 ` [PATCH 03/10] ASoC: omap-abe-twl6040: Correct internal prefix, Kconfig entry Peter Ujfalusi
2011-12-14 10:23 ` Mark Brown
2011-12-14 9:46 ` [PATCH 04/10] include: platform_data: Platform data header for OMAP4 ASoC audio Peter Ujfalusi
2011-12-14 9:57 ` Mark Brown
2011-12-15 13:02 ` Péter Ujfalusi
2011-12-17 9:36 ` Mark Brown
2011-12-19 14:04 ` Peter Ujfalusi
2011-12-19 19:20 ` Tony Lindgren
2011-12-20 0:47 ` Mark Brown
2011-12-20 0:24 ` Mark Brown
2011-12-14 9:46 ` [PATCH 05/10] OMAP4: 4430sdp: Register platform device for OMAP4 audio Peter Ujfalusi
2011-12-14 18:00 ` Tony Lindgren [this message]
2011-12-14 9:46 ` [PATCH 06/10] ASoC: omap-abe-twl6040: Convert to platform deriver Peter Ujfalusi
2011-12-14 10:01 ` Mark Brown
2011-12-14 10:15 ` Péter Ujfalusi
2011-12-14 11:27 ` Mark Brown
2011-12-15 8:17 ` Péter Ujfalusi
2011-12-15 13:01 ` Péter Ujfalusi
2011-12-14 9:47 ` [PATCH 07/10] ASoC: omap-abe-twl6040: Add support for PandaBoard Peter Ujfalusi
2011-12-14 9:47 ` [PATCH 08/10] OMAP4: omap4panda: Enable audio support Peter Ujfalusi
2011-12-14 18:02 ` Tony Lindgren
2011-12-14 9:47 ` [PATCH 09/10] ASoC: omap-abe-twl6040: Add missing audio route information Peter Ujfalusi
2011-12-14 10:14 ` [alsa-devel] " Mark Brown
2011-12-21 18:26 ` [PATCH 00/10] OMAP4: ASoC: Support for PandaBoard family Liam Girdwood
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=20111214180045.GZ32251@atomide.com \
--to=tony@atomide.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=misael.lopez@ti.com \
--cc=peter.ujfalusi@ti.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).