[PATCH] alsa: add Beagleboard SoC configuration.

[PATCH] alsa: add Beagleboard SoC configuration.

[Felipe Contreras]

This is exactly the same as the overo configuration. It might make sense
to have them in a single one.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---

This was suggested by Koen Kooi.

 sound/soc/omap/Kconfig       |    8 ++
 sound/soc/omap/Makefile      |    2 +
 sound/soc/omap/omap3beagle.c |  149 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 159 insertions(+), 0 deletions(-)
 create mode 100644 sound/soc/omap/omap3beagle.c

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index d7b8939..ebad024 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -22,3 +22,11 @@ config SND_OMAP_SOC_OVERO
 	help
 	  Say Y if you want to add support for SoC audio on the Gumstix Overo.
 
+config SND_OMAP_SOC_OMAP3_BEAGLE
+	tristate "SoC Audio support for OMAP3 Beagle"
+	depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE
+	select SND_OMAP_SOC_MCBSP
+	select SND_SOC_TWL4030
+	help
+	  Say Y if you want to add support for SoC audio on the Beagleboard.
+
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index b96b97b..09fd0bb 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -8,7 +8,9 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
 # OMAP Machine Support
 snd-soc-n810-objs := n810.o
 snd-soc-overo-objs := overo.o
+snd-soc-omap3beagle-objs := omap3beagle.o
 
 obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
 obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
 
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
new file mode 100644
index 0000000..1d0e398
--- /dev/null
+++ b/sound/soc/omap/omap3beagle.c
@@ -0,0 +1,149 @@
+/*
+ * omap3beagle.c  --  SoC audio for OMAP3 Beagle
+ *
+ * Author: Steve Sakoman <steve@sakoman.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+#include <asm/mach-types.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
+#include <mach/mcbsp.h>
+
+#include "omap-mcbsp.h"
+#include "omap-pcm.h"
+#include "../codecs/twl4030.h"
+
+static int omap3beagle_hw_params(struct snd_pcm_substream *substream,
+	struct snd_pcm_hw_params *params)
+{
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
+	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
+	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
+	int ret;
+
+	/* Set codec DAI configuration */
+	ret = snd_soc_dai_set_fmt(codec_dai,
+				  SND_SOC_DAIFMT_I2S |
+				  SND_SOC_DAIFMT_NB_NF |
+				  SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0) {
+		printk(KERN_ERR "can't set codec DAI configuration\n");
+		return ret;
+	}
+
+	/* Set cpu DAI configuration */
+	ret = snd_soc_dai_set_fmt(cpu_dai,
+				  SND_SOC_DAIFMT_I2S |
+				  SND_SOC_DAIFMT_NB_NF |
+				  SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0) {
+		printk(KERN_ERR "can't set cpu DAI configuration\n");
+		return ret;
+	}
+
+	/* Set the codec system clock for DAC and ADC */
+	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
+				     SND_SOC_CLOCK_IN);
+	if (ret < 0) {
+		printk(KERN_ERR "can't set codec system clock\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static struct snd_soc_ops omap3beagle_ops = {
+	.hw_params = omap3beagle_hw_params,
+};
+
+/* Digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link omap3beagle_dai = {
+	.name = "TWL4030",
+	.stream_name = "TWL4030",
+	.cpu_dai = &omap_mcbsp_dai[0],
+	.codec_dai = &twl4030_dai,
+	.ops = &omap3beagle_ops,
+};
+
+/* Audio machine driver */
+static struct snd_soc_machine snd_soc_machine_omap3beagle = {
+	.name = "omap3beagle",
+	.dai_link = &omap3beagle_dai,
+	.num_links = 1,
+};
+
+/* Audio subsystem */
+static struct snd_soc_device omap3beagle_snd_devdata = {
+	.machine = &snd_soc_machine_omap3beagle,
+	.platform = &omap_soc_platform,
+	.codec_dev = &soc_codec_dev_twl4030,
+};
+
+static struct platform_device *omap3beagle_snd_device;
+
+static int __init omap3beagle_soc_init(void)
+{
+	int ret;
+
+	printk(KERN_INFO "OMAP3 Beagle SoC init\n");
+	if (!machine_is_omap3_beagle()) {
+		printk(KERN_ERR "Not OMAP3 Beagle!\n");
+		return -ENODEV;
+	}
+
+	omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
+	if (!omap3beagle_snd_device) {
+		printk(KERN_ERR "Platform device allocation failed\n");
+		return -ENOMEM;
+	}
+
+	platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata);
+	omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev;
+	*(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */
+
+	ret = platform_device_add(omap3beagle_snd_device);
+	if (ret)
+		goto err1;
+
+	return 0;
+
+err1:
+	printk(KERN_ERR "Unable to add platform device\n");
+	platform_device_put(omap3beagle_snd_device);
+
+	return ret;
+}
+
+static void __exit omap3beagle_soc_exit(void)
+{
+	platform_device_unregister(omap3beagle_snd_device);
+}
+
+module_init(omap3beagle_soc_init);
+module_exit(omap3beagle_soc_exit);
+
+MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>");
+MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle");
+MODULE_LICENSE("GPL");
-- 
1.6.0.1

Re: [PATCH] alsa: add Beagleboard SoC configuration.

[Jarkko Nikula]

On Tue, 16 Sep 2008 23:51:35 +0300
"ext Felipe Contreras" <felipe.contreras@gmail.com> wrote:

> This is exactly the same as the overo configuration. It might make
> sense to have them in a single one.
> 
> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> 
> This was suggested by Koen Kooi.
> 
>  sound/soc/omap/Kconfig       |    8 ++
>  sound/soc/omap/Makefile      |    2 +
>  sound/soc/omap/omap3beagle.c |  149 +++++++++++++++++++++++++++++++++
> +++++++++ 3 files changed, 159 insertions(+), 0 deletions(-)
>  create mode 100644 sound/soc/omap/omap3beagle.c
> 
Actually I've been using patched Overo driver in my Beagle for
couple days now :-)

However I propose to keep Beagle and Overo separated as this patch
does. I think Overo can have more versatile audio connections than
Beagle and thus likely to be extended over time where as Beagle audio
HW is fixed as it's now.

Steve, any comments?


Jarkko

Re: [PATCH] alsa: add Beagleboard SoC configuration.

[Steve Sakoman]

On Tue, Sep 16, 2008 at 1:51 PM, Felipe Contreras
<felipe.contreras@gmail.com> wrote:
> This is exactly the same as the overo configuration. It might make sense
> to have them in a single one.

I plan to add support for additional input channels on Overo that are
not present on Beagle, so I think separate machine files makes sense
in the long run.

> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>

Acked-by: Steve Sakoman <steve@sakoman.com>

Steve

Re: [PATCH] alsa: add Beagleboard SoC configuration.

[David Brownell]

On Tuesday 16 September 2008, Felipe Contreras wrote:
> This is exactly the same as the overo configuration. It might make sense
> to have them in a single one.

I got a hard lockup (no timer ticking), no blinkenlights, etc ...
doesn't look like the issue is *this* driver.


% aplay dedodedo.wav
=============================================
[ INFO: possible recursive locking detected ]
2.6.27-rc8-omap1 #174
---------------------------------------------
aplay/1816 is trying to acquire lock:
 (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70

but task is already holding lock:
 (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70

other info that might help us debug this:
3 locks held by aplay/1816:
 #0:  (&pcm->open_mutex){--..}, at: [<c0239ffc>] snd_pcm_open+0xac/0x168
 #1:  (pcm_mutex){--..}, at: [<c0258690>] soc_pcm_open+0x40/0x350
 #2:  (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70

stack backtrace:
[<c002ce78>] (dump_stack+0x0/0x14) from [<c006a498>] (print_deadlock_bug+0xa0/0xcc)
[<c006a3f8>] (print_deadlock_bug+0x0/0xcc) from [<c006a61c>] (check_deadlock+0x158/0x18c)
 r7:c046efe8 r6:c781f1c0 r5:c781f518 r4:80000093
[<c006a4c4>] (check_deadlock+0x0/0x18c) from [<c006d050>] (validate_chain+0x3c0/0x4e8)
[<c006cc90>] (validate_chain+0x0/0x4e8) from [<c006d73c>] (__lock_acquire+0x5c4/0x668)
[<c006d178>] (__lock_acquire+0x0/0x668) from [<c006d844>] (lock_acquire+0x64/0x78)
[<c006d7e0>] (lock_acquire+0x0/0x78) from [<c030c874>] (_spin_lock_irqsave+0x4c/0x60)
 r7:c7939c00 r6:80000093 r5:c0036be4 r4:c03f3030
[<c030c828>] (_spin_lock_irqsave+0x0/0x60) from [<c0036be4>] (clk_enable+0x24/0x70)
 r6:c0411130 r5:c03ec7e4 r4:c03f13e0
[<c0036bc0>] (clk_enable+0x0/0x70) from [<c0033918>] (omap_mcbsp_clk_enable+0x24/0x3c)
 r5:c03ec7e4 r4:00000000
[<c00338f4>] (omap_mcbsp_clk_enable+0x0/0x3c) from [<c0031724>] (_omap2_clk_enable+0x38/0x88)
 r5:80000013 r4:c03ec7e4
[<c00316ec>] (_omap2_clk_enable+0x0/0x88) from [<c00318b8>] (omap2_clk_enable+0x5c/0x9c)
 r5:80000013 r4:c03ec7e4
[<c003185c>] (omap2_clk_enable+0x0/0x9c) from [<c0036c08>] (clk_enable+0x48/0x70)
 r5:80000013 r4:c03ec7e4
[<c0036bc0>] (clk_enable+0x0/0x70) from [<c003b7ac>] (omap_mcbsp_request+0x74/0x1dc)
 r5:c78248cc r4:c7824800
[<c003b738>] (omap_mcbsp_request+0x0/0x1dc) from [<c025c664>] (omap_mcbsp_dai_startup+0x34/0x38)
 r5:c7b2c400 r4:c0410ff0
[<c025c630>] (omap_mcbsp_dai_startup+0x0/0x38) from [<c02586a4>] (soc_pcm_open+0x54/0x350)
[<c0258650>] (soc_pcm_open+0x0/0x350) from [<c0239e68>] (snd_pcm_open_substream+0x5c/0xa4)
[<c0239e0c>] (snd_pcm_open_substream+0x0/0xa4) from [<c0239ee4>] (snd_pcm_open_file+0x34/0xa0)
 r5:c7b9ddcc r4:c7b7a780
[<c0239eb0>] (snd_pcm_open_file+0x0/0xa0) from [<c023a010>] (snd_pcm_open+0xc0/0x168)
 r6:c7b9c000 r5:c7939a00 r4:00000000
[<c0239f50>] (snd_pcm_open+0x0/0x168) from [<c023a364>] (snd_pcm_playback_open+0x34/0x38)
[<c023a330>] (snd_pcm_playback_open+0x0/0x38) from [<c022d1c4>] (__snd_open+0xd0/0x158)
 r5:c7b7a780 r4:c031eab4
[<c022d0f4>] (__snd_open+0x0/0x158) from [<c022d25c>] (snd_open+0x10/0x14)
 r7:c7a4adc0 r6:00000000 r5:c7860340 r4:00000000
[<c022d24c>] (snd_open+0x0/0x14) from [<c009f80c>] (chrdev_open+0x150/0x174)
[<c009f6bc>] (chrdev_open+0x0/0x174) from [<c009ad98>] (__dentry_open+0x138/0x250)
 r8:c7a23180 r7:00000000 r6:c009f6bc r5:c7a4adc0 r4:c7b7a780
[<c009ac60>] (__dentry_open+0x0/0x250) from [<c009aee8>] (nameidata_to_filp+0x38/0x50)
[<c009aeb0>] (nameidata_to_filp+0x0/0x50) from [<c00a8018>] (do_filp_open+0x2ac/0x630)
 r4:00000000
[<c00a7d6c>] (do_filp_open+0x0/0x630) from [<c009ab78>] (do_sys_open+0x5c/0xec)
[<c009ab1c>] (do_sys_open+0x0/0xec) from [<c009ac40>] (sys_open+0x24/0x28)
 r8:c0028d84 r7:00000005 r6:00000001 r5:00000000 r4:00000000
[<c009ac1c>] (sys_open+0x0/0x28) from [<c0028c00>] (ret_fast_syscall+0x0/0x2c)


BUG: spinlock lockup on CPU#0, aplay/1816, c03f3030
[<c002ce78>] (dump_stack+0x0/0x14) from [<c016d690>] (__spin_lock_debug+0x90/0xa4)
[<c016d600>] (__spin_lock_debug+0x0/0xa4) from [<c016d7e0>] (_raw_spin_lock+0x84/0xa4)
 r8:c0411344 r7:c7939c00 r6:00000000 r5:c7b9c000 r4:c03f3030
[<c016d75c>] (_raw_spin_lock+0x0/0xa4) from [<c030c87c>] (_spin_lock_irqsave+0x54/0x60)
 r7:c7939c00 r6:80000093 r5:c0036be4 r4:c03f3030
[<c030c828>] (_spin_lock_irqsave+0x0/0x60) from [<c0036be4>] (clk_enable+0x24/0x70)
 r6:c0411130 r5:c03ec7e4 r4:c03f13e0
[<c0036bc0>] (clk_enable+0x0/0x70) from [<c0033918>] (omap_mcbsp_clk_enable+0x24/0x3c)
 r5:c03ec7e4 r4:00000000
[<c00338f4>] (omap_mcbsp_clk_enable+0x0/0x3c) from [<c0031724>] (_omap2_clk_enable+0x38/0x88)
 r5:80000013 r4:c03ec7e4
[<c00316ec>] (_omap2_clk_enable+0x0/0x88) from [<c00318b8>] (omap2_clk_enable+0x5c/0x9c)
 r5:80000013 r4:c03ec7e4
[<c003185c>] (omap2_clk_enable+0x0/0x9c) from [<c0036c08>] (clk_enable+0x48/0x70)
 r5:80000013 r4:c03ec7e4
[<c0036bc0>] (clk_enable+0x0/0x70) from [<c003b7ac>] (omap_mcbsp_request+0x74/0x1dc)
 r5:c78248cc r4:c7824800
[<c003b738>] (omap_mcbsp_request+0x0/0x1dc) from [<c025c664>] (omap_mcbsp_dai_startup+0x34/0x38)
 r5:c7b2c400 r4:c0410ff0
[<c025c630>] (omap_mcbsp_dai_startup+0x0/0x38) from [<c02586a4>] (soc_pcm_open+0x54/0x350)
[<c0258650>] (soc_pcm_open+0x0/0x350) from [<c0239e68>] (snd_pcm_open_substream+0x5c/0xa4)
[<c0239e0c>] (snd_pcm_open_substream+0x0/0xa4) from [<c0239ee4>] (snd_pcm_open_file+0x34/0xa0)
 r5:c7b9ddcc r4:c7b7a780
[<c0239eb0>] (snd_pcm_open_file+0x0/0xa0) from [<c023a010>] (snd_pcm_open+0xc0/0x168)
 r6:c7b9c000 r5:c7939a00 r4:00000000
[<c0239f50>] (snd_pcm_open+0x0/0x168) from [<c023a364>] (snd_pcm_playback_open+0x34/0x38)
[<c023a330>] (snd_pcm_playback_open+0x0/0x38) from [<c022d1c4>] (__snd_open+0xd0/0x158)
 r5:c7b7a780 r4:c031eab4
[<c022d0f4>] (__snd_open+0x0/0x158) from [<c022d25c>] (snd_open+0x10/0x14)
 r7:c7a4adc0 r6:00000000 r5:c7860340 r4:00000000
[<c022d24c>] (snd_open+0x0/0x14) from [<c009f80c>] (chrdev_open+0x150/0x174)
[<c009f6bc>] (chrdev_open+0x0/0x174) from [<c009ad98>] (__dentry_open+0x138/0x250)
 r8:c7a23180 r7:00000000 r6:c009f6bc r5:c7a4adc0 r4:c7b7a780
[<c009ac60>] (__dentry_open+0x0/0x250) from [<c009aee8>] (nameidata_to_filp+0x38/0x50)
[<c009aeb0>] (nameidata_to_filp+0x0/0x50) from [<c00a8018>] (do_filp_open+0x2ac/0x630)
 r4:00000000
[<c00a7d6c>] (do_filp_open+0x0/0x630) from [<c009ab78>] (do_sys_open+0x5c/0xec)
[<c009ab1c>] (do_sys_open+0x0/0xec) from [<c009ac40>] (sys_open+0x24/0x28)
 r8:c0028d84 r7:00000005 r6:00000001 r5:00000000 r4:00000000
[<c009ac1c>] (sys_open+0x0/0x28) from [<c0028c00>] (ret_fast_syscall+0x0/0x2c)

Re: [PATCH] alsa: add Beagleboard SoC configuration.

[Paul Walmsley]

Hi David,

On Fri, 3 Oct 2008, David Brownell wrote:

> On Tuesday 16 September 2008, Felipe Contreras wrote:
> > This is exactly the same as the overo configuration. It might make sense
> > to have them in a single one.
> 
> I got a hard lockup (no timer ticking), no blinkenlights, etc ...
> doesn't look like the issue is *this* driver.

...

> [ INFO: possible recursive locking detected ]
> 2.6.27-rc8-omap1 #174
> ---------------------------------------------
> aplay/1816 is trying to acquire lock:
>  (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70
> 
> but task is already holding lock:
>  (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70

Yeah, the code that's in that driver is broken.  The driver 
sets up a custom clk_enable() function that calls clk_enable() again.  And 
clk_enable() takes clockfw_lock.

The omap_clk_associate() code should resolve this problem.


- Paul

Re: [PATCH] alsa: add Beagleboard SoC configuration.

[David Brownell]

On Monday 06 October 2008, Paul Walmsley wrote:
> > [ INFO: possible recursive locking detected ]
> > 2.6.27-rc8-omap1 #174
> > ---------------------------------------------
> > aplay/1816 is trying to acquire lock:
> >  (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70
> > 
> > but task is already holding lock:
> >  (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70
> 
> Yeah, the code that's in that driver is broken.  The driver 
> sets up a custom clk_enable() function that calls clk_enable() again.  And 
> clk_enable() takes clockfw_lock.

I don't follow.  Could you point at those lines of code?
The only clkfw_lock I see is in plat-omap/clock.c code ...
which isn't part of this ASoC driver or even its board glue.

 
> The omap_clk_associate() code should resolve this problem.

Time to resolve that, then... are you saying that the patches
Felipe posted will, if merged, make this lockdep report go
away so it's safe to run lockdep and ALSA on twl4030 codecs?

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

Re: [PATCH] alsa: add Beagleboard SoC configuration.

[Felipe Balbi]

On Mon, Oct 06, 2008 at 11:01:53AM -0700, David Brownell wrote:
> On Monday 06 October 2008, Paul Walmsley wrote:
> > > [ INFO: possible recursive locking detected ]
> > > 2.6.27-rc8-omap1 #174
> > > ---------------------------------------------
> > > aplay/1816 is trying to acquire lock:
> > >  (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70
> > > 
> > > but task is already holding lock:
> > >  (clockfw_lock){....}, at: [<c0036be4>] clk_enable+0x24/0x70
> > 
> > Yeah, the code that's in that driver is broken.  The driver 
> > sets up a custom clk_enable() function that calls clk_enable() again.  And 
> > clk_enable() takes clockfw_lock.
> 
> I don't follow.  Could you point at those lines of code?
> The only clkfw_lock I see is in plat-omap/clock.c code ...
> which isn't part of this ASoC driver or even its board glue.
> 
>  
> > The omap_clk_associate() code should resolve this problem.
> 
> Time to resolve that, then... are you saying that the patches
> Felipe posted will, if merged, make this lockdep report go
> away so it's safe to run lockdep and ALSA on twl4030 codecs?

heh, I'll repost tomorrow changing the name to omap_clk_associate()

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

[PATCH] alsa: add beagleboard SoC configuration.

[Felipe Contreras]

This is exactly the same as the overo configuration.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
---

I'm resending this patch since it hasn't been applied yet.

I have only tested this with alsa->oss emulation.

 sound/soc/omap/Kconfig       |    8 ++
 sound/soc/omap/Makefile      |    2 +
 sound/soc/omap/omap3beagle.c |  149 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 159 insertions(+), 0 deletions(-)
 create mode 100644 sound/soc/omap/omap3beagle.c

diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
index d7b8939..ebad024 100644
--- a/sound/soc/omap/Kconfig
+++ b/sound/soc/omap/Kconfig
@@ -22,3 +22,11 @@ config SND_OMAP_SOC_OVERO
 	help
 	  Say Y if you want to add support for SoC audio on the Gumstix Overo.
 
+config SND_OMAP_SOC_OMAP3_BEAGLE
+	tristate "SoC Audio support for OMAP3 Beagle"
+	depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE
+	select SND_OMAP_SOC_MCBSP
+	select SND_SOC_TWL4030
+	help
+	  Say Y if you want to add support for SoC audio on the Beagleboard.
+
diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
index b96b97b..09fd0bb 100644
--- a/sound/soc/omap/Makefile
+++ b/sound/soc/omap/Makefile
@@ -8,7 +8,9 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
 # OMAP Machine Support
 snd-soc-n810-objs := n810.o
 snd-soc-overo-objs := overo.o
+snd-soc-omap3beagle-objs := omap3beagle.o
 
 obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
 obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
+obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
 
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
new file mode 100644
index 0000000..1d0e398
--- /dev/null
+++ b/sound/soc/omap/omap3beagle.c
@@ -0,0 +1,149 @@
+/*
+ * omap3beagle.c  --  SoC audio for OMAP3 Beagle
+ *
+ * Author: Steve Sakoman <steve@sakoman.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA
+ *
+ */
+
+#include <linux/clk.h>
+#include <linux/platform_device.h>
+#include <sound/core.h>
+#include <sound/pcm.h>
+#include <sound/soc.h>
+#include <sound/soc-dapm.h>
+
+#include <asm/mach-types.h>
+#include <mach/hardware.h>
+#include <mach/gpio.h>
+#include <mach/mcbsp.h>
+
+#include "omap-mcbsp.h"
+#include "omap-pcm.h"
+#include "../codecs/twl4030.h"
+
+static int omap3beagle_hw_params(struct snd_pcm_substream *substream,
+	struct snd_pcm_hw_params *params)
+{
+	struct snd_soc_pcm_runtime *rtd = substream->private_data;
+	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
+	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
+	int ret;
+
+	/* Set codec DAI configuration */
+	ret = snd_soc_dai_set_fmt(codec_dai,
+				  SND_SOC_DAIFMT_I2S |
+				  SND_SOC_DAIFMT_NB_NF |
+				  SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0) {
+		printk(KERN_ERR "can't set codec DAI configuration\n");
+		return ret;
+	}
+
+	/* Set cpu DAI configuration */
+	ret = snd_soc_dai_set_fmt(cpu_dai,
+				  SND_SOC_DAIFMT_I2S |
+				  SND_SOC_DAIFMT_NB_NF |
+				  SND_SOC_DAIFMT_CBM_CFM);
+	if (ret < 0) {
+		printk(KERN_ERR "can't set cpu DAI configuration\n");
+		return ret;
+	}
+
+	/* Set the codec system clock for DAC and ADC */
+	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
+				     SND_SOC_CLOCK_IN);
+	if (ret < 0) {
+		printk(KERN_ERR "can't set codec system clock\n");
+		return ret;
+	}
+
+	return 0;
+}
+
+static struct snd_soc_ops omap3beagle_ops = {
+	.hw_params = omap3beagle_hw_params,
+};
+
+/* Digital audio interface glue - connects codec <--> CPU */
+static struct snd_soc_dai_link omap3beagle_dai = {
+	.name = "TWL4030",
+	.stream_name = "TWL4030",
+	.cpu_dai = &omap_mcbsp_dai[0],
+	.codec_dai = &twl4030_dai,
+	.ops = &omap3beagle_ops,
+};
+
+/* Audio machine driver */
+static struct snd_soc_machine snd_soc_machine_omap3beagle = {
+	.name = "omap3beagle",
+	.dai_link = &omap3beagle_dai,
+	.num_links = 1,
+};
+
+/* Audio subsystem */
+static struct snd_soc_device omap3beagle_snd_devdata = {
+	.machine = &snd_soc_machine_omap3beagle,
+	.platform = &omap_soc_platform,
+	.codec_dev = &soc_codec_dev_twl4030,
+};
+
+static struct platform_device *omap3beagle_snd_device;
+
+static int __init omap3beagle_soc_init(void)
+{
+	int ret;
+
+	printk(KERN_INFO "OMAP3 Beagle SoC init\n");
+	if (!machine_is_omap3_beagle()) {
+		printk(KERN_ERR "Not OMAP3 Beagle!\n");
+		return -ENODEV;
+	}
+
+	omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
+	if (!omap3beagle_snd_device) {
+		printk(KERN_ERR "Platform device allocation failed\n");
+		return -ENOMEM;
+	}
+
+	platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata);
+	omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev;
+	*(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */
+
+	ret = platform_device_add(omap3beagle_snd_device);
+	if (ret)
+		goto err1;
+
+	return 0;
+
+err1:
+	printk(KERN_ERR "Unable to add platform device\n");
+	platform_device_put(omap3beagle_snd_device);
+
+	return ret;
+}
+
+static void __exit omap3beagle_soc_exit(void)
+{
+	platform_device_unregister(omap3beagle_snd_device);
+}
+
+module_init(omap3beagle_soc_init);
+module_exit(omap3beagle_soc_exit);
+
+MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>");
+MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle");
+MODULE_LICENSE("GPL");
-- 
1.6.0.2

Re: [PATCH] alsa: add beagleboard SoC configuration.

[Tony Lindgren]

* Felipe Contreras <felipe.contreras@gmail.com> [081022 09:31]:
> This is exactly the same as the overo configuration.

This should go to alsa-devel list with l-o list cc'd. AFAIK, all
the omap ASoC stuff is in mainline already. I will not push it
to l-o until we have an ack from alsa-devel.

Cheers,

Tony


> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> ---
> 
> I'm resending this patch since it hasn't been applied yet.
> 
> I have only tested this with alsa->oss emulation.
> 
>  sound/soc/omap/Kconfig       |    8 ++
>  sound/soc/omap/Makefile      |    2 +
>  sound/soc/omap/omap3beagle.c |  149 ++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 159 insertions(+), 0 deletions(-)
>  create mode 100644 sound/soc/omap/omap3beagle.c
> 
> diff --git a/sound/soc/omap/Kconfig b/sound/soc/omap/Kconfig
> index d7b8939..ebad024 100644
> --- a/sound/soc/omap/Kconfig
> +++ b/sound/soc/omap/Kconfig
> @@ -22,3 +22,11 @@ config SND_OMAP_SOC_OVERO
>  	help
>  	  Say Y if you want to add support for SoC audio on the Gumstix Overo.
>  
> +config SND_OMAP_SOC_OMAP3_BEAGLE
> +	tristate "SoC Audio support for OMAP3 Beagle"
> +	depends on SND_OMAP_SOC && MACH_OMAP3_BEAGLE
> +	select SND_OMAP_SOC_MCBSP
> +	select SND_SOC_TWL4030
> +	help
> +	  Say Y if you want to add support for SoC audio on the Beagleboard.
> +
> diff --git a/sound/soc/omap/Makefile b/sound/soc/omap/Makefile
> index b96b97b..09fd0bb 100644
> --- a/sound/soc/omap/Makefile
> +++ b/sound/soc/omap/Makefile
> @@ -8,7 +8,9 @@ obj-$(CONFIG_SND_OMAP_SOC_MCBSP) += snd-soc-omap-mcbsp.o
>  # OMAP Machine Support
>  snd-soc-n810-objs := n810.o
>  snd-soc-overo-objs := overo.o
> +snd-soc-omap3beagle-objs := omap3beagle.o
>  
>  obj-$(CONFIG_SND_OMAP_SOC_N810) += snd-soc-n810.o
>  obj-$(CONFIG_SND_OMAP_SOC_OVERO) += snd-soc-overo.o
> +obj-$(CONFIG_SND_OMAP_SOC_OMAP3_BEAGLE) += snd-soc-omap3beagle.o
>  
> diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c
> new file mode 100644
> index 0000000..1d0e398
> --- /dev/null
> +++ b/sound/soc/omap/omap3beagle.c
> @@ -0,0 +1,149 @@
> +/*
> + * omap3beagle.c  --  SoC audio for OMAP3 Beagle
> + *
> + * Author: Steve Sakoman <steve@sakoman.com>
> + *
> + * This program is free software; you can redistribute it and/or
> + * modify it under the terms of the GNU General Public License
> + * version 2 as published by the Free Software Foundation.
> + *
> + * This program is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program; if not, write to the Free Software
> + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
> + * 02110-1301 USA
> + *
> + */
> +
> +#include <linux/clk.h>
> +#include <linux/platform_device.h>
> +#include <sound/core.h>
> +#include <sound/pcm.h>
> +#include <sound/soc.h>
> +#include <sound/soc-dapm.h>
> +
> +#include <asm/mach-types.h>
> +#include <mach/hardware.h>
> +#include <mach/gpio.h>
> +#include <mach/mcbsp.h>
> +
> +#include "omap-mcbsp.h"
> +#include "omap-pcm.h"
> +#include "../codecs/twl4030.h"
> +
> +static int omap3beagle_hw_params(struct snd_pcm_substream *substream,
> +	struct snd_pcm_hw_params *params)
> +{
> +	struct snd_soc_pcm_runtime *rtd = substream->private_data;
> +	struct snd_soc_dai *codec_dai = rtd->dai->codec_dai;
> +	struct snd_soc_dai *cpu_dai = rtd->dai->cpu_dai;
> +	int ret;
> +
> +	/* Set codec DAI configuration */
> +	ret = snd_soc_dai_set_fmt(codec_dai,
> +				  SND_SOC_DAIFMT_I2S |
> +				  SND_SOC_DAIFMT_NB_NF |
> +				  SND_SOC_DAIFMT_CBM_CFM);
> +	if (ret < 0) {
> +		printk(KERN_ERR "can't set codec DAI configuration\n");
> +		return ret;
> +	}
> +
> +	/* Set cpu DAI configuration */
> +	ret = snd_soc_dai_set_fmt(cpu_dai,
> +				  SND_SOC_DAIFMT_I2S |
> +				  SND_SOC_DAIFMT_NB_NF |
> +				  SND_SOC_DAIFMT_CBM_CFM);
> +	if (ret < 0) {
> +		printk(KERN_ERR "can't set cpu DAI configuration\n");
> +		return ret;
> +	}
> +
> +	/* Set the codec system clock for DAC and ADC */
> +	ret = snd_soc_dai_set_sysclk(codec_dai, 0, 26000000,
> +				     SND_SOC_CLOCK_IN);
> +	if (ret < 0) {
> +		printk(KERN_ERR "can't set codec system clock\n");
> +		return ret;
> +	}
> +
> +	return 0;
> +}
> +
> +static struct snd_soc_ops omap3beagle_ops = {
> +	.hw_params = omap3beagle_hw_params,
> +};
> +
> +/* Digital audio interface glue - connects codec <--> CPU */
> +static struct snd_soc_dai_link omap3beagle_dai = {
> +	.name = "TWL4030",
> +	.stream_name = "TWL4030",
> +	.cpu_dai = &omap_mcbsp_dai[0],
> +	.codec_dai = &twl4030_dai,
> +	.ops = &omap3beagle_ops,
> +};
> +
> +/* Audio machine driver */
> +static struct snd_soc_machine snd_soc_machine_omap3beagle = {
> +	.name = "omap3beagle",
> +	.dai_link = &omap3beagle_dai,
> +	.num_links = 1,
> +};
> +
> +/* Audio subsystem */
> +static struct snd_soc_device omap3beagle_snd_devdata = {
> +	.machine = &snd_soc_machine_omap3beagle,
> +	.platform = &omap_soc_platform,
> +	.codec_dev = &soc_codec_dev_twl4030,
> +};
> +
> +static struct platform_device *omap3beagle_snd_device;
> +
> +static int __init omap3beagle_soc_init(void)
> +{
> +	int ret;
> +
> +	printk(KERN_INFO "OMAP3 Beagle SoC init\n");
> +	if (!machine_is_omap3_beagle()) {
> +		printk(KERN_ERR "Not OMAP3 Beagle!\n");
> +		return -ENODEV;
> +	}
> +
> +	omap3beagle_snd_device = platform_device_alloc("soc-audio", -1);
> +	if (!omap3beagle_snd_device) {
> +		printk(KERN_ERR "Platform device allocation failed\n");
> +		return -ENOMEM;
> +	}
> +
> +	platform_set_drvdata(omap3beagle_snd_device, &omap3beagle_snd_devdata);
> +	omap3beagle_snd_devdata.dev = &omap3beagle_snd_device->dev;
> +	*(unsigned int *)omap3beagle_dai.cpu_dai->private_data = 1; /* McBSP2 */
> +
> +	ret = platform_device_add(omap3beagle_snd_device);
> +	if (ret)
> +		goto err1;
> +
> +	return 0;
> +
> +err1:
> +	printk(KERN_ERR "Unable to add platform device\n");
> +	platform_device_put(omap3beagle_snd_device);
> +
> +	return ret;
> +}
> +
> +static void __exit omap3beagle_soc_exit(void)
> +{
> +	platform_device_unregister(omap3beagle_snd_device);
> +}
> +
> +module_init(omap3beagle_soc_init);
> +module_exit(omap3beagle_soc_exit);
> +
> +MODULE_AUTHOR("Steve Sakoman <steve@sakoman.com>");
> +MODULE_DESCRIPTION("ALSA SoC OMAP3 Beagle");
> +MODULE_LICENSE("GPL");
> -- 
> 1.6.0.2
> 
> --
> 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

Re: [PATCH] alsa: add beagleboard SoC configuration.

[David Brownell]

On Wednesday 22 October 2008, Felipe Contreras wrote:
> +
> +       printk(KERN_INFO "OMAP3 Beagle SoC init\n");
> +       if (!machine_is_omap3_beagle()) {
> +               printk(KERN_ERR "Not OMAP3 Beagle!\n");
> +               return -ENODEV;
> +       }
> +

Note that the version I (re)posted fixed the bogus messaging
on non-Beagle boards.  Move that KERN_INFO after the "if ...)".
And for that matter, the KERN_ERR isn't really an error; it's
quite legit to have a kernel support e.g. both Overo and Beagle.

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

Re: [PATCH] alsa: add beagleboard SoC configuration.

[David Brownell]

On Wednesday 22 October 2008, Tony Lindgren wrote:
> This should go to alsa-devel list with l-o list cc'd. AFAIK, all
> the omap ASoC stuff is in mainline already. I will not push it
> to l-o until we have an ack from alsa-devel.

There are multiple ASoc bits ... they're not all there yet.
The TWL4030 codec support should be ready to go, now that its
core has merged, plus Overo (and "soon" Beagle) board support.

The twl4030-core support was the blocking issue; at least some
of the other patches were even acked.

  http://marc.info/?t=122304728600007&r=1&w=2

Maybe Steve would resubmit his patches, to merge through ALSA
into 2.6.28-rc?  I presume all the feedback from his first round
(beginning of September) got addressed.  

- Dave

Re: [PATCH] alsa: add beagleboard SoC configuration.

[Steve Sakoman]

On Wed, Oct 22, 2008 at 12:36 PM, David Brownell <david-b@pacbell.net> wrote:
> On Wednesday 22 October 2008, Tony Lindgren wrote:
>> This should go to alsa-devel list with l-o list cc'd. AFAIK, all
>> the omap ASoC stuff is in mainline already. I will not push it
>> to l-o until we have an ack from alsa-devel.
>
> There are multiple ASoc bits ... they're not all there yet.
> The TWL4030 codec support should be ready to go, now that its
> core has merged, plus Overo (and "soon" Beagle) board support.
>
> The twl4030-core support was the blocking issue; at least some
> of the other patches were even acked.
>
>  http://marc.info/?t=122304728600007&r=1&w=2
>
> Maybe Steve would resubmit his patches, to merge through ALSA
> into 2.6.28-rc?  I presume all the feedback from his first round
> (beginning of September) got addressed.

Yes, all of the feedback from the first round of submissions was
addressed.  I received an ack for the twl4030 codec driver as well as
the Overo driver.

At the time, the feedback from the alsa-devel list was that they were
OK with these patches living in linux-omap until the twl4030 driver
was mainline ready.

So Tony merged them into linux-omap at that point.

I am happy to resubmit the patches, if that is what folks want.  I'm
copying alsa-devel so they can weigh in on the decision.

Steve

Re: [PATCH] alsa: add beagleboard SoC configuration.

[Mark Brown]

On Wed, Oct 22, 2008 at 01:30:26PM -0700, Steve Sakoman wrote:

> At the time, the feedback from the alsa-devel list was that they were
> OK with these patches living in linux-omap until the twl4030 driver
> was mainline ready.

Indeed.  The only blocker was that TWL4030 codec support breaks the
build of SND_SOC_ALL_CODECS without the core support for the chip - I
gave it my ack otherwise already.  Since the core support has now been
merged by Linus this shouldn't be an issue once ALSA has synchronised
with mainline.

> I am happy to resubmit the patches, if that is what folks want.  I'm
> copying alsa-devel so they can weigh in on the decision.

Once mainline is merged up to the ASoC topic branch it should be fine to
go via ALSA.  I've got some other stuff waiting for that to happen
myself so if you want to send a patch queue I can queue that in there.
I was going to wait for rc1 before asking Takashi to merge up to the
ASoC branches.

Re: [PATCH] alsa: add beagleboard SoC configuration.

[Tony Lindgren]

* David Brownell <david-b@pacbell.net> [081022 12:14]:
> On Wednesday 22 October 2008, Felipe Contreras wrote:
> > +
> > +       printk(KERN_INFO "OMAP3 Beagle SoC init\n");
> > +       if (!machine_is_omap3_beagle()) {
> > +               printk(KERN_ERR "Not OMAP3 Beagle!\n");
> > +               return -ENODEV;
> > +       }
> > +
> 
> Note that the version I (re)posted fixed the bogus messaging
> on non-Beagle boards.  Move that KERN_INFO after the "if ...)".
> And for that matter, the KERN_ERR isn't really an error; it's
> quite legit to have a kernel support e.g. both Overo and Beagle.

OK, will push Dave's fixed version.

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

Re: [PATCH] alsa: add beagleboard SoC configuration.

[Mark Brown]

On Wed, Oct 22, 2008 at 09:44:48PM +0100, Mark Brown wrote:
> On Wed, Oct 22, 2008 at 01:30:26PM -0700, Steve Sakoman wrote:

> > I am happy to resubmit the patches, if that is what folks want.  I'm
> > copying alsa-devel so they can weigh in on the decision.

> Once mainline is merged up to the ASoC topic branch it should be fine to
> go via ALSA.  I've got some other stuff waiting for that to happen
> myself so if you want to send a patch queue I can queue that in there.
> I was going to wait for rc1 before asking Takashi to merge up to the
> ASoC branches.

Ping?  I'd like to start pushing more ASoC v2 stuff soon - that means
more API churn so it'd be easier to get as much stuff merged as
possible.

Re: [PATCH] alsa: add beagleboard SoC configuration.

[Steve Sakoman]

On Thu, Oct 30, 2008 at 4:45 AM, Mark Brown <broonie@sirena.org.uk> wrote:
> On Wed, Oct 22, 2008 at 09:44:48PM +0100, Mark Brown wrote:
>> On Wed, Oct 22, 2008 at 01:30:26PM -0700, Steve Sakoman wrote:
>
>> > I am happy to resubmit the patches, if that is what folks want.  I'm
>> > copying alsa-devel so they can weigh in on the decision.
>
>> Once mainline is merged up to the ASoC topic branch it should be fine to
>> go via ALSA.  I've got some other stuff waiting for that to happen
>> myself so if you want to send a patch queue I can queue that in there.
>> I was going to wait for rc1 before asking Takashi to merge up to the
>> ASoC branches.
>
> Ping?  I'd like to start pushing more ASoC v2 stuff soon - that means
> more API churn so it'd be easier to get as much stuff merged as
> possible.

OK, I will resubmit.  I will be out of the office for much of the day,
so it will likely not be till this evening.

Steve