aboutsummaryrefslogtreecommitdiffstats
path: root/sound/soc/samsung/smdk_wm8580.c
diff options
context:
space:
mode:
authorJassi Brar <jassi.brar@samsung.com>2010-12-19 21:05:48 -0500
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-12-20 08:45:52 -0500
commit72685f27b1aed0d104e9356e30343506a4e09c30 (patch)
tree9d6eb138a320fb2056ec05172a50baa2ba5baeec /sound/soc/samsung/smdk_wm8580.c
parent775bc97131c3dcf62d29cdb33e00db8f827eac35 (diff)
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: Jassi Brar <jassi.brar@samsung.com> Acked-by: Liam Girdwood <lrg@slimlogic.co.uk> Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Diffstat (limited to 'sound/soc/samsung/smdk_wm8580.c')
-rw-r--r--sound/soc/samsung/smdk_wm8580.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/sound/soc/samsung/smdk_wm8580.c b/sound/soc/samsung/smdk_wm8580.c
index e2d56b9bac5a..e4f3bc8c1248 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[] = {
212 [PRI_PLAYBACK] = { /* Primary Playback i/f */ 212 [PRI_PLAYBACK] = { /* Primary Playback i/f */
213 .name = "WM8580 PAIF RX", 213 .name = "WM8580 PAIF RX",
214 .stream_name = "Playback", 214 .stream_name = "Playback",
215 .cpu_dai_name = "samsung-i2s.2", 215 .cpu_dai_name = "samsung-i2s.0",
216 .codec_dai_name = "wm8580-hifi-playback", 216 .codec_dai_name = "wm8580-hifi-playback",
217 .platform_name = "samsung-audio", 217 .platform_name = "samsung-audio",
218 .codec_name = "wm8580-codec.0-001b", 218 .codec_name = "wm8580-codec.0-001b",
@@ -222,7 +222,7 @@ static struct snd_soc_dai_link smdk_dai[] = {
222 [PRI_CAPTURE] = { /* Primary Capture i/f */ 222 [PRI_CAPTURE] = { /* Primary Capture i/f */
223 .name = "WM8580 PAIF TX", 223 .name = "WM8580 PAIF TX",
224 .stream_name = "Capture", 224 .stream_name = "Capture",
225 .cpu_dai_name = "samsung-i2s.2", 225 .cpu_dai_name = "samsung-i2s.0",
226 .codec_dai_name = "wm8580-hifi-capture", 226 .codec_dai_name = "wm8580-hifi-capture",
227 .platform_name = "samsung-audio", 227 .platform_name = "samsung-audio",
228 .codec_name = "wm8580-codec.0-001b", 228 .codec_name = "wm8580-codec.0-001b",
@@ -256,14 +256,14 @@ static int __init smdk_audio_init(void)
256 256
257 if (machine_is_smdkc100()) { 257 if (machine_is_smdkc100()) {
258 smdk.num_links = 3; 258 smdk.num_links = 3;
259 /* S5PC100 has I2S0 as v5 */
260 str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
261 str[strlen(str) - 1] = '0';
262 str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
263 str[strlen(str) - 1] = '0';
264 /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */ 259 /* Secondary is at offset SAMSUNG_I2S_SECOFF from Primary */
265 str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name; 260 str = (char *)smdk_dai[SEC_PLAYBACK].cpu_dai_name;
266 str[strlen(str) - 1] = '0' + SAMSUNG_I2S_SECOFF; 261 str[strlen(str) - 1] = '0' + SAMSUNG_I2S_SECOFF;
262 } else if (machine_is_smdk6410()) {
263 str = (char *)smdk_dai[PRI_PLAYBACK].cpu_dai_name;
264 str[strlen(str) - 1] = '2';
265 str = (char *)smdk_dai[PRI_CAPTURE].cpu_dai_name;
266 str[strlen(str) - 1] = '2';
267 } 267 }
268 268
269 smdk_snd_device = platform_device_alloc("soc-audio", -1); 269 smdk_snd_device = platform_device_alloc("soc-audio", -1);