[alsa-devel] [patch] bugfix: SOUND: SOC: OMAP: Add support for Gumstix Overo
From: David Brownell dbrownell@users.sourceforge.net
Get rid of bogus ASOC boot messages on non-Overo boards, such as with a kernel built for both Overo and Beagle.
Signed-off-by: David Brownell dbrownell@users.sourceforge.net Acked-By: Steve Sakoman steve@sakoman.com --- I'm not sure where the four patches for Overo support are in the ALSA queue (that's how they'll merge, yes?) but I'll suggest this one merge into the initial "overo.c" submit...
sound/soc/omap/overo.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
--- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c @@ -107,11 +107,11 @@ static int __init overo_soc_init(void) { int ret;
- printk(KERN_INFO "overo SoC init\n"); if (!machine_is_overo()) { - printk(KERN_ERR "Not Overo!\n"); + pr_debug("Not Overo!\n"); return -ENODEV; } + printk(KERN_INFO "overo SoC init\n");
overo_snd_device = platform_device_alloc("soc-audio", -1); if (!overo_snd_device) { @@ -135,13 +135,12 @@ err1:
return ret; } +module_init(overo_soc_init);
static void __exit overo_soc_exit(void) { platform_device_unregister(overo_snd_device); } - -module_init(overo_soc_init); module_exit(overo_soc_exit);
MODULE_AUTHOR("Steve Sakoman steve@sakoman.com");
On Fri, Oct 03, 2008 at 08:11:33AM -0700, David Brownell wrote:
Get rid of bogus ASOC boot messages on non-Overo boards, such as with a kernel built for both Overo and Beagle.
<nitpick>It's ASoC, not ASOC.</nitpick>
I'm not sure where the four patches for Overo support are in the ALSA queue (that's how they'll merge, yes?) but I'll suggest this one merge into the initial "overo.c" submit...
They're not queued in ALSA since they depend on the PMIC codec driver which in turn depends on the PMIC core driver being merged. The change looks good, FWIW but...
@@ -135,13 +135,12 @@ err1:
return ret; } +module_init(overo_soc_init);
static void __exit overo_soc_exit(void) { platform_device_unregister(overo_snd_device); }
-module_init(overo_soc_init); module_exit(overo_soc_exit);
This is a reasonable change but unrelated to your patch description.
On Friday 03 October 2008, Mark Brown wrote:
I'm not sure where the four patches for Overo support are in the ALSA queue (that's how they'll merge, yes?) but I'll suggest this one merge into the initial "overo.c" submit...
They're not queued in ALSA since they depend on the PMIC codec driver which in turn depends on the PMIC core driver being merged.
I'm working on getting the twl4030 core merged ... expecting it to be there for 2.6.28-early. Since this codec driver doesn't need interrupts, it's particularly undemanding. :)
So if the only place these are queued is the OMAP tree, and there is no particular objection to the patch, then there'd seem be no issue merging it to the OMAP tree and having it be part of the initial merge-to-mainline...
- Dave
On Fri, Oct 03, 2008 at 08:37:14AM -0700, David Brownell wrote:
So if the only place these are queued is the OMAP tree, and there is no particular objection to the patch, then there'd seem be no issue merging it to the OMAP tree and having it be part of the initial merge-to-mainline...
Yes, please squash it in with the other changes when you submit the twl4030 dependant stuff.
On Fri, Oct 03, 2008 at 06:49:48PM +0100, Mark Brown wrote:
On Fri, Oct 03, 2008 at 08:37:14AM -0700, David Brownell wrote:
So if the only place these are queued is the OMAP tree, and there is no particular objection to the patch, then there'd seem be no issue merging it to the OMAP tree and having it be part of the initial merge-to-mainline...
Yes, please squash it in with the other changes when you submit the twl4030 dependant stuff.
Also, the McBSP changes needed for ASoC are on their way to the mainline kernel.
Tony
* Tony Lindgren tony@atomide.com [081004 10:36]:
On Fri, Oct 03, 2008 at 06:49:48PM +0100, Mark Brown wrote:
On Fri, Oct 03, 2008 at 08:37:14AM -0700, David Brownell wrote:
So if the only place these are queued is the OMAP tree, and there is no particular objection to the patch, then there'd seem be no issue merging it to the OMAP tree and having it be part of the initial merge-to-mainline...
Yes, please squash it in with the other changes when you submit the twl4030 dependant stuff.
I've pushed Dave's fix into linux-omap tree.
Also, the McBSP changes needed for ASoC are on their way to the mainline kernel.
Tony
To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
participants (3)
-
David Brownell -
Mark Brown -
Tony Lindgren