From: Peter Ujfalusi <peter.ujfalusi@ti.com>
To: Liam Girdwood <lrg@ti.com>, Tony Lindgren <tony@atomide.com>,
Mark Brown <broonie@opensource.wolfsonmicro.com>,
Samuel Ortiz <sameo@linux.intel.com>,
Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org, linux-omap@vger.kernel.org,
linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org,
Peter Ujfalusi <peter.ujfalusi@ti.com>
Subject: [PATCH v5 13/18] ASoC: twl6040: add all ABE DAIs
Date: Mon, 13 Jun 2011 19:37:45 +0300 [thread overview]
Message-ID: <1307983070-2257-14-git-send-email-peter.ujfalusi@ti.com> (raw)
In-Reply-To: <1307983070-2257-1-git-send-email-peter.ujfalusi@ti.com>
From: Liam Girdwood <lrg@ti.com>
Add all DAIs to fully support OMAP4 ABE.
Signed-off-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
---
sound/soc/codecs/twl6040.c | 44 ++++++++++++++++++++++++++++++++++++--------
1 files changed, 36 insertions(+), 8 deletions(-)
diff --git a/sound/soc/codecs/twl6040.c b/sound/soc/codecs/twl6040.c
index a20e293..28dc5d9 100644
--- a/sound/soc/codecs/twl6040.c
+++ b/sound/soc/codecs/twl6040.c
@@ -1359,23 +1359,51 @@ static struct snd_soc_dai_ops twl6040_dai_ops = {
.set_sysclk = twl6040_set_dai_sysclk,
};
-static struct snd_soc_dai_driver twl6040_dai = {
- .name = "twl6040-hifi",
+static struct snd_soc_dai_driver twl6040_dai[] = {
+{
+ .name = "twl6040-ul",
+ .capture = {
+ .stream_name = "Capture",
+ .channels_min = 1,
+ .channels_max = 2,
+ .rates = TWL6040_RATES,
+ .formats = TWL6040_FORMATS,
+ },
+ .ops = &twl6040_dai_ops,
+},
+{
+ .name = "twl6040-dl1",
.playback = {
- .stream_name = "Playback",
+ .stream_name = "Headset Playback",
.channels_min = 1,
- .channels_max = 4,
+ .channels_max = 2,
.rates = TWL6040_RATES,
.formats = TWL6040_FORMATS,
},
- .capture = {
- .stream_name = "Capture",
+ .ops = &twl6040_dai_ops,
+},
+{
+ .name = "twl6040-dl2",
+ .playback = {
+ .stream_name = "Handsfree Playback",
.channels_min = 1,
.channels_max = 2,
.rates = TWL6040_RATES,
.formats = TWL6040_FORMATS,
},
.ops = &twl6040_dai_ops,
+},
+{
+ .name = "twl6040-vib",
+ .playback = {
+ .stream_name = "Vibra Playback",
+ .channels_min = 2,
+ .channels_max = 2,
+ .rates = SNDRV_PCM_RATE_CONTINUOUS,
+ .formats = TWL6040_FORMATS,
+ },
+ .ops = &twl6040_dai_ops,
+},
};
#ifdef CONFIG_PM
@@ -1502,8 +1530,8 @@ static struct snd_soc_codec_driver soc_codec_dev_twl6040 = {
static int __devinit twl6040_codec_probe(struct platform_device *pdev)
{
- return snd_soc_register_codec(&pdev->dev,
- &soc_codec_dev_twl6040, &twl6040_dai, 1);
+ return snd_soc_register_codec(&pdev->dev, &soc_codec_dev_twl6040,
+ twl6040_dai, ARRAY_SIZE(twl6040_dai));
}
static int __devexit twl6040_codec_remove(struct platform_device *pdev)
--
1.7.5.3
next prev parent reply other threads:[~2011-06-13 16:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-13 16:37 [PATCH v5 00/18] MFD/ASoC/Input: TWL4030/TWL60X0 changes Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 01/18] OMAP: New twl-common for common TWL configuration Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 02/18] OMAP4: Move common twl6030 configuration to twl-common Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 03/18] OMAP3: Move common twl " Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 04/18] OMAP3: Move common regulator " Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 05/18] MFD: twl4030-codec: Rename internals from codec to audio Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 06/18] MFD: twl4030-codec -> twl4030-audio: Rename the driver Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 07/18] MFD: twl4030-audio: Rename platform data Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 08/18] mfd: twl6040: Add initial support Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 09/18] ASoC: twl6040: Convert into TWL6040 MFD child Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 10/18] MFD: twl6040: Change platform data for soc codec driver Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 11/18] input: Add initial support for TWL6040 vibrator Peter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 12/18] OMAP4: SDP4430: Add twl6040 vibrator platform support Peter Ujfalusi
2011-06-13 16:37 ` Peter Ujfalusi [this message]
2011-06-17 13:29 ` [alsa-devel] [PATCH v5 13/18] ASoC: twl6040: add all ABE DAIs Mark Brown
2011-06-13 16:37 ` [PATCH v5 14/18] ASoC: twl6040: Support other sample rates in constraints Peter Ujfalusi
2011-06-17 13:22 ` [alsa-devel] " Mark Brown
2011-06-17 13:09 ` Péter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 15/18] ASoC: twl6040: Remove pll and headset mode dependency Peter Ujfalusi
2011-06-17 13:27 ` [alsa-devel] " Mark Brown
2011-06-17 13:04 ` Péter Ujfalusi
2011-06-13 16:37 ` [PATCH v5 16/18] ASoC: twl6040: set default constraints Peter Ujfalusi
2011-06-17 13:28 ` [alsa-devel] " Mark Brown
2011-06-13 16:37 ` [PATCH v5 17/18] ASoC: twl6040: Configure ramp step based on platform Peter Ujfalusi
2011-06-17 13:29 ` [alsa-devel] " Mark Brown
2011-06-13 16:37 ` [PATCH v5 18/18] OMAP4: SDP4430: Add twl6040 codec platform support Peter Ujfalusi
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=1307983070-2257-14-git-send-email-peter.ujfalusi@ti.com \
--to=peter.ujfalusi@ti.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=dmitry.torokhov@gmail.com \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=lrg@ti.com \
--cc=sameo@linux.intel.com \
--cc=tony@atomide.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
all inboxes | Powered by JetHome®