Skip to contentSkip to conversation

bugfix: SOUND: SOC: OMAP: Add support for Gumstix Overo

PATCH In review David Brownell 3 participants 6 messages Oct 3, 2008 – Oct 6, 2008

Subsystems (2)
Sound ASoC
lore
Share & tools
lore

David Brownell

author
#0 lore raw

PATCH 1/1 bugfix: SOUND: SOC: OMAP: Add support for Gumstix Overo

From: David Brownell <[email protected]>

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 <[email protected]>
Acked-by Steve Sakoman <[email protected]>

---
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(-)
sound/soc/omap/overo.c +3 -4
@@ -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 <[email protected]>");
#1 lore raw
Quoted 2 lines · David Brownell

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>

Quoted 4 lines

---
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...

sound/soc/omap/overo.c err1: · line 144

Quoted 13 lines
sound/soc/omap/overo.c +1 -2
@@ -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.

author
#2 lore raw
Quoted 7 lines · Mark Brown
Quoted 4 lines

---
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

#3 lore raw
Quoted 4 lines · David Brownell

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.

#4 lore raw
Quoted 9 lines · Mark Brown
Quoted 4 lines · David Brownell

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

#5 lore raw
Quoted 10 lines · Tony Lindgren
Quoted 9 lines · Mark Brown
Quoted 4 lines · David Brownell

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.

Quoted 8 lines

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 [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html