From: Jassi@alsa-project.org, "Brar <jassisinghbrar"@gmail.com
To: alsa-devel@alsa-project.org
Cc: lrg@slimlogic.co.uk, kgene.kim@samsung.com,
Jassi Brar <jassi.brar@samsung.com>,
broonie@opensource.wolfsonmicro.com
Subject: [PATCH 03/10] ASoC: SMDK_WM8580: Make I2S0 as default dai
Date: Mon, 20 Dec 2010 11:05:48 +0900 [thread overview]
Message-ID: <1292810748-30000-1-git-send-email-jassisinghbrar@gmail.com> (raw)
In-Reply-To: <1292810667-29773-1-git-send-email-jassisinghbrar@gmail.com>
From: Jassi Brar <jassi.brar@samsung.com>
Since most newer SMDKs have I2S0 routed to the WM8580's Primary DAI,
future changes can be minimized if the default CPU DAIs are set to
0, rather than 2.
Signed-off-by: Jassi Brar <jassi.brar@samsung.com>
---
sound/soc/samsung/smdk_wm8580.c | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index e2d56b9..e4f3bc8 100644
--- a/sound/soc/samsung/smdk_wm8580.c
+++ b/sound/soc/samsung/smdk_wm8580.c
@@ -212,7 +212,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
[PRI_PLAYBACK] = { /* Primary Playback i/f */
.name = "WM8580 PAIF RX",
.stream_name = "Playback",
- .cpu_dai_name = "samsung-i2s.2",
+ .cpu_dai_name = "samsung-i2s.0",
.codec_dai_name = "wm8580-hifi-playback",
.platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b",
@@ -222,7 +222,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
[PRI_CAPTURE] = { /* Primary Capture i/f */
.name = "WM8580 PAIF TX",
.stream_name = "Capture",
- .cpu_dai_name = "samsung-i2s.2",
+ .cpu_dai_name = "samsung-i2s.0",
.codec_dai_name = "wm8580-hifi-capture",
.platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b",
@@ -256,14 +256,14 @@ static int __init smdk_audio_init(void)
if (machine_is_smdkc100()) {
smdk.num_links = 3;
- /* S5PC100 has I2S0 as v5 */
- str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
- str[strlen(str) - 1] = '0';
- str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
- str[strlen(str) - 1] = '0';
/* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name;
str[strlen(str) - 1] = '0' + SAMSUNG_I2S_SECOFF;
+ } else if (machine_is_smdk6410()) {
+ str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
+ str[strlen(str) - 1] = '2';
+ str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
+ str[strlen(str) - 1] = '2';
}
smdk_snd_device = platform_device_alloc("soc-audio", -1);
--
1.6.2.5
next prev parent reply other threads:[~2010-12-20 2:27 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-12-20 2:04 [PATCHes 00/10] ASoC: Samsung: Enable latest SoCs Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` [PATCH 01/10] ASoC: Samsung: Set default rclk source rate Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` [PATCH 02/10] ASoC: Samsung: I2S: Flush FIFO after stop Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` Jassi, Brar <jassisinghbrar [this message]
2010-12-20 2:05 ` [PATCH 04/10] ASoC: SMDK6440: Enable I2S device Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` [PATCH 05/10] ASoC: SMDK6450: " Jassi, Brar <jassisinghbrar
2010-12-20 13:43 ` Mark Brown
2010-12-20 2:05 ` [PATCH 06/10] ASoC: SMDK6442: " Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` [PATCH 07/10] ASoC: SMDKV210: " Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` [PATCH 08/10] ASoC: SMDKC110: " Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` [PATCH 09/10] ASoC: SMDKV310: Enable AC97 device Jassi, Brar <jassisinghbrar
2010-12-20 2:05 ` [PATCH 10/10] ASoC: SMDKV310: Add I2S support Jassi, Brar <jassisinghbrar
2010-12-20 13:41 ` Mark Brown
2010-12-20 9:32 ` [PATCHes 00/10] ASoC: Samsung: Enable latest SoCs Liam Girdwood
2010-12-20 13:45 ` Mark Brown
2010-12-21 1:53 ` Jassi Brar
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=1292810748-30000-1-git-send-email-jassisinghbrar@gmail.com \
--to=jassi@alsa-project.org \
--cc="Brar <jassisinghbrar"@gmail.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=jassi.brar@samsung.com \
--cc=kgene.kim@samsung.com \
--cc=lrg@slimlogic.co.uk \
/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