Commit 72685f27 authored by Jassi Brar's avatar Jassi Brar Committed by Mark Brown

ASoC: SMDK_WM8580: Make I2S0 as default dai

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: default avatarJassi Brar <jassi.brar@samsung.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 775bc971
...@@ -212,7 +212,7 @@ static struct snd_soc_dai_link smdk_dai[] = { ...@@ -212,7 +212,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
[PRI_PLAYBACK] = { /* Primary Playback i/f */ [PRI_PLAYBACK] = { /* Primary Playback i/f */
.name = "WM8580 PAIF RX", .name = "WM8580 PAIF RX",
.stream_name = "Playback", .stream_name = "Playback",
.cpu_dai_name = "samsung-i2s.2", .cpu_dai_name = "samsung-i2s.0",
.codec_dai_name = "wm8580-hifi-playback", .codec_dai_name = "wm8580-hifi-playback",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b", .codec_name = "wm8580-codec.0-001b",
...@@ -222,7 +222,7 @@ static struct snd_soc_dai_link smdk_dai[] = { ...@@ -222,7 +222,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
[PRI_CAPTURE] = { /* Primary Capture i/f */ [PRI_CAPTURE] = { /* Primary Capture i/f */
.name = "WM8580 PAIF TX", .name = "WM8580 PAIF TX",
.stream_name = "Capture", .stream_name = "Capture",
.cpu_dai_name = "samsung-i2s.2", .cpu_dai_name = "samsung-i2s.0",
.codec_dai_name = "wm8580-hifi-capture", .codec_dai_name = "wm8580-hifi-capture",
.platform_name = "samsung-audio", .platform_name = "samsung-audio",
.codec_name = "wm8580-codec.0-001b", .codec_name = "wm8580-codec.0-001b",
...@@ -256,14 +256,14 @@ static int __init smdk_audio_init(void) ...@@ -256,14 +256,14 @@ static int __init smdk_audio_init(void)
if (machine_is_smdkc100()) { if (machine_is_smdkc100()) {
smdk.num_links = 3; 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 */ /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name; str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name;
str[strlen(str) - 1] = '0' + SAMSUNG_I2S_SECOFF; 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); smdk_snd_device = platform_device_alloc("soc-audio", -1);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment