ASoC: SMDK_WM8580: Make I2S0 as default dai
authorJassi Brar <jassi.brar@samsung.com>
Mon, 20 Dec 2010 02:05:48 +0000 (11:05 +0900)
committerMark Brown <broonie@opensource.wolfsonmicro.com>
Mon, 20 Dec 2010 13:45:52 +0000 (13:45 +0000)
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>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
sound/soc/samsung/smdk_wm8580.c

index e2d56b9..e4f3bc8 100644 (file)
@@ -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);