From: apatard@mandriva.com
To: alsa-devel@alsa-project.org
Cc: nico@fluxnic.net, broonie@opensource.wolfsonmicro.com,
saeed@marvell.com, Arnaud Patard <apatard@mandriva.com>,
tbm@cyrius.com, linux-arm-kernel@lists.infradead.org,
lrg@slimlogic.co.uk
Subject: [patch 4/4] kirkwood: Add audio support to openrd client platforms
Date: Mon, 31 May 2010 13:49:15 +0200 [thread overview]
Message-ID: <20100531115004.101767088@mandriva.com> (raw)
In-Reply-To: 20100531114911.487732770@mandriva.com
[-- Attachment #1: openrd_audio.patch --]
[-- Type: text/plain, Size: 4790 bytes --]
This patch is adding support for openrd client platforms. It's using
the cs42l51 codec and has one mic and one speaker plugs.
Signed-off-by: Arnaud Patard <apatard@mandriva.com>
Index: sound-2.6/sound/soc/kirkwood/Kconfig
===================================================================
--- sound-2.6.orig/sound/soc/kirkwood/Kconfig 2010-05-27 14:09:55.807674540 +0200
+++ sound-2.6/sound/soc/kirkwood/Kconfig 2010-05-27 14:10:03.887694459 +0200
@@ -9,3 +9,12 @@ config SND_KIRKWOOD_SOC
config SND_KIRKWOOD_SOC_I2S
tristate
+config SND_KIRKWOOD_SOC_OPENRD
+ tristate "SoC Audio support for Kirkwood Openrd Client"
+ depends on SND_KIRKWOOD_SOC && MACH_OPENRD_CLIENT
+ select SND_KIRKWOOD_SOC_I2S
+ select SND_SOC_CS42L51
+ help
+ Say Y if you want to add support for SoC audio on
+ Openrd Client.
+
Index: sound-2.6/sound/soc/kirkwood/Makefile
===================================================================
--- sound-2.6.orig/sound/soc/kirkwood/Makefile 2010-05-27 14:09:55.867694480 +0200
+++ sound-2.6/sound/soc/kirkwood/Makefile 2010-05-27 14:10:03.953137222 +0200
@@ -4,3 +4,6 @@ snd-soc-kirkwood-i2s-objs := kirkwood-i2
obj-$(CONFIG_SND_KIRKWOOD_SOC) += snd-soc-kirkwood.o
obj-$(CONFIG_SND_KIRKWOOD_SOC_I2S) += snd-soc-kirkwood-i2s.o
+snd-soc-openrd-objs := kirkwood-openrd.o
+
+obj-$(CONFIG_SND_KIRKWOOD_SOC_OPENRD) += snd-soc-openrd.o
Index: sound-2.6/sound/soc/kirkwood/kirkwood-openrd.c
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
+++ sound-2.6/sound/soc/kirkwood/kirkwood-openrd.c 2010-05-27 14:10:03.987735275 +0200
@@ -0,0 +1,126 @@
+/*
+ * kirkwood-openrd.c
+ *
+ * (c) 2010 Arnaud Patard <apatard@mandriva.com>
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version.
+ */
+
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/interrupt.h>
+#include <linux/platform_device.h>
+#include <linux/slab.h>
+#include <sound/soc.h>
+#include <mach/kirkwood.h>
+#include <plat/audio.h>
+#include <asm/mach-types.h>
+#include "kirkwood-i2s.h"
+#include "kirkwood-dma.h"
+#include "../codecs/cs42l51.h"
+
+static int openrd_client_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;
+ unsigned int freq, fmt;
+
+ fmt = SND_SOC_DAIFMT_I2S | SND_SOC_DAIFMT_CBS_CFS;
+ ret = snd_soc_dai_set_fmt(cpu_dai, fmt);
+ if (ret < 0)
+ return ret;
+
+ ret = snd_soc_dai_set_fmt(codec_dai, fmt);
+ if (ret < 0)
+ return ret;
+
+ switch (params_rate(params)) {
+ default:
+ case 44100:
+ freq = 11289600;
+ break;
+ case 48000:
+ freq = 12288000;
+ break;
+ case 96000:
+ freq = 24576000;
+ break;
+ }
+
+ return snd_soc_dai_set_sysclk(codec_dai, 0, freq, SND_SOC_CLOCK_IN);
+
+}
+
+static struct snd_soc_ops openrd_client_ops = {
+ .hw_params = openrd_client_hw_params,
+};
+
+
+static struct snd_soc_dai_link openrd_client_dai[] = {
+{
+ .name = "CS42L51",
+ .stream_name = "CS42L51 HiFi",
+ .cpu_dai = &kirkwood_i2s_dai,
+ .codec_dai = &cs42l51_dai,
+ .ops = &openrd_client_ops,
+},
+};
+
+
+static struct snd_soc_card openrd_client = {
+ .name = "OpenRD Client",
+ .platform = &kirkwood_soc_platform,
+ .dai_link = openrd_client_dai,
+ .num_links = ARRAY_SIZE(openrd_client_dai),
+};
+
+static struct snd_soc_device openrd_client_snd_devdata = {
+ .card = &openrd_client,
+ .codec_dev = &soc_codec_device_cs42l51,
+};
+
+static struct platform_device *openrd_client_snd_device;
+
+static int __init openrd_client_init(void)
+{
+ int ret;
+
+ if (!machine_is_openrd_client())
+ return 0;
+
+ openrd_client_snd_device = platform_device_alloc("soc-audio", -1);
+ if (!openrd_client_snd_device)
+ return -ENOMEM;
+
+ platform_set_drvdata(openrd_client_snd_device,
+ &openrd_client_snd_devdata);
+ openrd_client_snd_devdata.dev = &openrd_client_snd_device->dev;
+
+ ret = platform_device_add(openrd_client_snd_device);
+ if (ret) {
+ printk(KERN_ERR "%s: platform_device_add failed\n", __func__);
+ platform_device_put(openrd_client_snd_device);
+ }
+
+ return ret;
+}
+
+static void __exit openrd_client_exit(void)
+{
+ platform_device_unregister(openrd_client_snd_device);
+}
+
+module_init(openrd_client_init);
+module_exit(openrd_client_exit);
+
+/* Module information */
+MODULE_AUTHOR("Arnaud Patard <apatard@mandriva.com>");
+MODULE_DESCRIPTION("ALSA SoC OpenRD Client");
+MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:soc-audio");
WARNING: multiple messages have this Message-ID (diff)
From: apatard@mandriva.com (apatard at mandriva.com)
To: linux-arm-kernel@lists.infradead.org
Subject: [patch 4/4] kirkwood: Add audio support to openrd client platforms
Date: Mon, 31 May 2010 13:49:15 +0200 [thread overview]
Message-ID: <20100531115004.101767088@mandriva.com> (raw)
In-Reply-To: 20100531114911.487732770@mandriva.com
An embedded and charset-unspecified text was scrubbed...
Name: openrd_audio.patch
URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20100531/cfaaacc9/attachment.el>
next prev parent reply other threads:[~2010-05-31 11:50 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-27 12:57 [patch 0/6] kirkwood openrd client audio support - v4 apatard
2010-05-27 12:57 ` apatard at mandriva.com
2010-05-27 12:57 ` [patch 1/6] orion/kirkwood: add audio functions apatard
2010-05-27 12:57 ` apatard at mandriva.com
2010-05-30 20:16 ` Nicolas Pitre
2010-05-30 20:16 ` Nicolas Pitre
2010-05-31 11:14 ` Mark Brown
2010-05-31 11:14 ` Mark Brown
2010-05-31 11:49 ` [patch 0/4] " apatard
2010-05-31 11:49 ` apatard at mandriva.com
2010-05-31 11:49 ` [patch 1/4] " apatard
2010-05-31 11:49 ` apatard at mandriva.com
2010-05-31 12:17 ` Mark Brown
2010-05-31 12:17 ` Mark Brown
2010-05-31 11:49 ` [patch 2/4] openrd-client: initialise audio apatard
2010-05-31 11:49 ` apatard at mandriva.com
2010-05-31 11:49 ` [patch 3/4] kirkwood: Add i2s support apatard
2010-05-31 11:49 ` apatard at mandriva.com
2010-05-31 11:49 ` apatard [this message]
2010-05-31 11:49 ` [patch 4/4] kirkwood: Add audio support to openrd client platforms apatard at mandriva.com
2010-05-27 12:57 ` [patch 2/6] openrd-client: initialise audio apatard
2010-05-27 12:57 ` apatard at mandriva.com
2010-05-27 12:57 ` [patch 3/6] soc-dapm.h: add SND_SOC_DAPM_PRE_POST_PMD event apatard
2010-05-27 12:57 ` apatard at mandriva.com
2010-05-31 11:20 ` Mark Brown
2010-05-31 11:20 ` Mark Brown
2010-05-27 12:57 ` [patch 4/6] cs42l51: add asoc driver apatard
2010-05-27 12:57 ` apatard at mandriva.com
2010-05-31 11:20 ` Mark Brown
2010-05-31 11:20 ` Mark Brown
2010-05-27 12:57 ` [patch 5/6] kirkwood: Add i2s support apatard
2010-05-27 12:57 ` apatard at mandriva.com
2010-05-27 12:57 ` [patch 6/6] kirkwood: Add audio support to openrd client platforms apatard
2010-05-27 12:57 ` apatard at mandriva.com
2010-05-30 20:44 ` [patch 0/6] kirkwood openrd client audio support - v4 Nicolas Pitre
2010-05-30 20:44 ` Nicolas Pitre
2010-05-31 10:15 ` Liam Girdwood
2010-05-31 10:15 ` [alsa-devel] " 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=20100531115004.101767088@mandriva.com \
--to=apatard@mandriva.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=lrg@slimlogic.co.uk \
--cc=nico@fluxnic.net \
--cc=saeed@marvell.com \
--cc=tbm@cyrius.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.