diff options
Diffstat (limited to 'sound/soc/samsung')
-rw-r--r-- | sound/soc/samsung/neo1973_gta02_wm8753.c | 6 | ||||
-rw-r--r-- | sound/soc/samsung/neo1973_wm8753.c | 6 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_hermes.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 4 | ||||
-rw-r--r-- | sound/soc/samsung/s3c24xx_uda134x.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/sound/soc/samsung/neo1973_gta02_wm8753.c b/sound/soc/samsung/neo1973_gta02_wm8753.c index 3eec610c10f9..0d0ae2b9eef6 100644 --- a/sound/soc/samsung/neo1973_gta02_wm8753.c +++ b/sound/soc/samsung/neo1973_gta02_wm8753.c | |||
@@ -397,11 +397,11 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { | |||
397 | { /* Hifi Playback - for similatious use with voice below */ | 397 | { /* Hifi Playback - for similatious use with voice below */ |
398 | .name = "WM8753", | 398 | .name = "WM8753", |
399 | .stream_name = "WM8753 HiFi", | 399 | .stream_name = "WM8753 HiFi", |
400 | .cpu_dai_name = "s3c24xx-i2s", | 400 | .cpu_dai_name = "s3c24xx-iis", |
401 | .codec_dai_name = "wm8753-hifi", | 401 | .codec_dai_name = "wm8753-hifi", |
402 | .init = neo1973_gta02_wm8753_init, | 402 | .init = neo1973_gta02_wm8753_init, |
403 | .platform_name = "samsung-audio", | 403 | .platform_name = "samsung-audio", |
404 | .codec_name = "wm8753-codec.0-0x1a", | 404 | .codec_name = "wm8753-codec.0-001a", |
405 | .ops = &neo1973_gta02_hifi_ops, | 405 | .ops = &neo1973_gta02_hifi_ops, |
406 | }, | 406 | }, |
407 | { /* Voice via BT */ | 407 | { /* Voice via BT */ |
@@ -410,7 +410,7 @@ static struct snd_soc_dai_link neo1973_gta02_dai[] = { | |||
410 | .cpu_dai_name = "bluetooth-dai", | 410 | .cpu_dai_name = "bluetooth-dai", |
411 | .codec_dai_name = "wm8753-voice", | 411 | .codec_dai_name = "wm8753-voice", |
412 | .ops = &neo1973_gta02_voice_ops, | 412 | .ops = &neo1973_gta02_voice_ops, |
413 | .codec_name = "wm8753-codec.0-0x1a", | 413 | .codec_name = "wm8753-codec.0-001a", |
414 | .platform_name = "samsung-audio", | 414 | .platform_name = "samsung-audio", |
415 | }, | 415 | }, |
416 | }; | 416 | }; |
diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index c7a24514beb5..d20815d5ab2e 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c | |||
@@ -559,9 +559,9 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
559 | .name = "WM8753", | 559 | .name = "WM8753", |
560 | .stream_name = "WM8753 HiFi", | 560 | .stream_name = "WM8753 HiFi", |
561 | .platform_name = "samsung-audio", | 561 | .platform_name = "samsung-audio", |
562 | .cpu_dai_name = "s3c24xx-i2s", | 562 | .cpu_dai_name = "s3c24xx-iis", |
563 | .codec_dai_name = "wm8753-hifi", | 563 | .codec_dai_name = "wm8753-hifi", |
564 | .codec_name = "wm8753-codec.0-0x1a", | 564 | .codec_name = "wm8753-codec.0-001a", |
565 | .init = neo1973_wm8753_init, | 565 | .init = neo1973_wm8753_init, |
566 | .ops = &neo1973_hifi_ops, | 566 | .ops = &neo1973_hifi_ops, |
567 | }, | 567 | }, |
@@ -571,7 +571,7 @@ static struct snd_soc_dai_link neo1973_dai[] = { | |||
571 | .platform_name = "samsung-audio", | 571 | .platform_name = "samsung-audio", |
572 | .cpu_dai_name = "bluetooth-dai", | 572 | .cpu_dai_name = "bluetooth-dai", |
573 | .codec_dai_name = "wm8753-voice", | 573 | .codec_dai_name = "wm8753-voice", |
574 | .codec_name = "wm8753-codec.0-0x1a", | 574 | .codec_name = "wm8753-codec.0-001a", |
575 | .ops = &neo1973_voice_ops, | 575 | .ops = &neo1973_voice_ops, |
576 | }, | 576 | }, |
577 | }; | 577 | }; |
diff --git a/sound/soc/samsung/s3c24xx_simtec_hermes.c b/sound/soc/samsung/s3c24xx_simtec_hermes.c index bb4292e3596c..08fcaaa66907 100644 --- a/sound/soc/samsung/s3c24xx_simtec_hermes.c +++ b/sound/soc/samsung/s3c24xx_simtec_hermes.c | |||
@@ -94,8 +94,8 @@ static int simtec_hermes_init(struct snd_soc_pcm_runtime *rtd) | |||
94 | static struct snd_soc_dai_link simtec_dai_aic33 = { | 94 | static struct snd_soc_dai_link simtec_dai_aic33 = { |
95 | .name = "tlv320aic33", | 95 | .name = "tlv320aic33", |
96 | .stream_name = "TLV320AIC33", | 96 | .stream_name = "TLV320AIC33", |
97 | .codec_name = "tlv320aic3x-codec.0-0x1a", | 97 | .codec_name = "tlv320aic3x-codec.0-001a", |
98 | .cpu_dai_name = "s3c24xx-i2s", | 98 | .cpu_dai_name = "s3c24xx-iis", |
99 | .codec_dai_name = "tlv320aic3x-hifi", | 99 | .codec_dai_name = "tlv320aic3x-hifi", |
100 | .platform_name = "samsung-audio", | 100 | .platform_name = "samsung-audio", |
101 | .init = simtec_hermes_init, | 101 | .init = simtec_hermes_init, |
diff --git a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c index fbba4e367729..116e3e670167 100644 --- a/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c +++ b/sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | |||
@@ -85,8 +85,8 @@ static int simtec_tlv320aic23_init(struct snd_soc_pcm_runtime *rtd) | |||
85 | static struct snd_soc_dai_link simtec_dai_aic23 = { | 85 | static struct snd_soc_dai_link simtec_dai_aic23 = { |
86 | .name = "tlv320aic23", | 86 | .name = "tlv320aic23", |
87 | .stream_name = "TLV320AIC23", | 87 | .stream_name = "TLV320AIC23", |
88 | .codec_name = "tlv320aic3x-codec.0-0x1a", | 88 | .codec_name = "tlv320aic3x-codec.0-001a", |
89 | .cpu_dai_name = "s3c24xx-i2s", | 89 | .cpu_dai_name = "s3c24xx-iis", |
90 | .codec_dai_name = "tlv320aic3x-hifi", | 90 | .codec_dai_name = "tlv320aic3x-hifi", |
91 | .platform_name = "samsung-audio", | 91 | .platform_name = "samsung-audio", |
92 | .init = simtec_tlv320aic23_init, | 92 | .init = simtec_tlv320aic23_init, |
diff --git a/sound/soc/samsung/s3c24xx_uda134x.c b/sound/soc/samsung/s3c24xx_uda134x.c index cdc8ecbcb8ef..2c09e93dd566 100644 --- a/sound/soc/samsung/s3c24xx_uda134x.c +++ b/sound/soc/samsung/s3c24xx_uda134x.c | |||
@@ -228,7 +228,7 @@ static struct snd_soc_dai_link s3c24xx_uda134x_dai_link = { | |||
228 | .stream_name = "UDA134X", | 228 | .stream_name = "UDA134X", |
229 | .codec_name = "uda134x-hifi", | 229 | .codec_name = "uda134x-hifi", |
230 | .codec_dai_name = "uda134x-hifi", | 230 | .codec_dai_name = "uda134x-hifi", |
231 | .cpu_dai_name = "s3c24xx-i2s", | 231 | .cpu_dai_name = "s3c24xx-iis", |
232 | .ops = &s3c24xx_uda134x_ops, | 232 | .ops = &s3c24xx_uda134x_ops, |
233 | .platform_name = "samsung-audio", | 233 | .platform_name = "samsung-audio", |
234 | }; | 234 | }; |