diff options
Diffstat (limited to 'sound/soc/imx')
-rw-r--r-- | sound/soc/imx/eukrea-tlv320.c | 2 | ||||
-rw-r--r-- | sound/soc/imx/imx-ssi.c | 2 | ||||
-rw-r--r-- | sound/soc/imx/phycore-ac97.c | 2 | ||||
-rw-r--r-- | sound/soc/imx/wm1133-ev1.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/imx/eukrea-tlv320.c b/sound/soc/imx/eukrea-tlv320.c index 807f736ee294..b59675257ce5 100644 --- a/sound/soc/imx/eukrea-tlv320.c +++ b/sound/soc/imx/eukrea-tlv320.c | |||
@@ -82,7 +82,7 @@ static struct snd_soc_dai_link eukrea_tlv320_dai = { | |||
82 | .codec_dai = "tlv320aic23-hifi", | 82 | .codec_dai = "tlv320aic23-hifi", |
83 | .platform_name = "imx-pcm-audio.0", | 83 | .platform_name = "imx-pcm-audio.0", |
84 | .codec_name = "tlv320aic23-codec.0-001a", | 84 | .codec_name = "tlv320aic23-codec.0-001a", |
85 | .cpu_dai = "imx-ssi-dai.0", | 85 | .cpu_dai = "imx-ssi.0", |
86 | .ops = &eukrea_tlv320_snd_ops, | 86 | .ops = &eukrea_tlv320_snd_ops, |
87 | }; | 87 | }; |
88 | 88 | ||
diff --git a/sound/soc/imx/imx-ssi.c b/sound/soc/imx/imx-ssi.c index 26716e9626f4..d4bd345b0a8d 100644 --- a/sound/soc/imx/imx-ssi.c +++ b/sound/soc/imx/imx-ssi.c | |||
@@ -734,7 +734,7 @@ static struct platform_driver imx_ssi_driver = { | |||
734 | .remove = __devexit_p(imx_ssi_remove), | 734 | .remove = __devexit_p(imx_ssi_remove), |
735 | 735 | ||
736 | .driver = { | 736 | .driver = { |
737 | .name = "imx-ssi-dai", | 737 | .name = "imx-ssi", |
738 | .owner = THIS_MODULE, | 738 | .owner = THIS_MODULE, |
739 | }, | 739 | }, |
740 | }; | 740 | }; |
diff --git a/sound/soc/imx/phycore-ac97.c b/sound/soc/imx/phycore-ac97.c index 65f0f99ca6dd..6a65dd705519 100644 --- a/sound/soc/imx/phycore-ac97.c +++ b/sound/soc/imx/phycore-ac97.c | |||
@@ -34,7 +34,7 @@ static struct snd_soc_dai_link imx_phycore_dai_ac97[] = { | |||
34 | .stream_name = "HiFi", | 34 | .stream_name = "HiFi", |
35 | .codec_dai_name = "wm9712-hifi", | 35 | .codec_dai_name = "wm9712-hifi", |
36 | .codec_name = "wm9712-codec", | 36 | .codec_name = "wm9712-codec", |
37 | .cpu_dai_name = "imx-ssi-dai.0", | 37 | .cpu_dai_name = "imx-ssi.0", |
38 | .platform_name = "imx-fiq-pcm-audio.0", | 38 | .platform_name = "imx-fiq-pcm-audio.0", |
39 | .ops = &imx_phycore_hifi_ops, | 39 | .ops = &imx_phycore_hifi_ops, |
40 | }, | 40 | }, |
diff --git a/sound/soc/imx/wm1133-ev1.c b/sound/soc/imx/wm1133-ev1.c index 74068636c1d8..30fdb15065be 100644 --- a/sound/soc/imx/wm1133-ev1.c +++ b/sound/soc/imx/wm1133-ev1.c | |||
@@ -243,7 +243,7 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) | |||
243 | static struct snd_soc_dai_link wm1133_ev1_dai = { | 243 | static struct snd_soc_dai_link wm1133_ev1_dai = { |
244 | .name = "WM1133-EV1", | 244 | .name = "WM1133-EV1", |
245 | .stream_name = "Audio", | 245 | .stream_name = "Audio", |
246 | .cpu_dai_name = "imx-ssi-dai.0", | 246 | .cpu_dai_name = "imx-ssi.0", |
247 | .codec_dai_name = "wm8350-hifi", | 247 | .codec_dai_name = "wm8350-hifi", |
248 | .platform_name = "imx-fiq-pcm-audio.0", | 248 | .platform_name = "imx-fiq-pcm-audio.0", |
249 | .codec_name = "wm8350-codec.0-0x1a", | 249 | .codec_name = "wm8350-codec.0-0x1a", |