diff options
Diffstat (limited to 'sound/soc/omap')
-rw-r--r-- | sound/soc/omap/omap2evm.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/omap3beagle.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/omap3pandora.c | 4 | ||||
-rw-r--r-- | sound/soc/omap/overo.c | 2 | ||||
-rw-r--r-- | sound/soc/omap/sdp3430.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sound/soc/omap/omap2evm.c b/sound/soc/omap/omap2evm.c index 0c2322dcf02..027e1a40f8a 100644 --- a/sound/soc/omap/omap2evm.c +++ b/sound/soc/omap/omap2evm.c | |||
@@ -86,7 +86,7 @@ static struct snd_soc_dai_link omap2evm_dai = { | |||
86 | .name = "TWL4030", | 86 | .name = "TWL4030", |
87 | .stream_name = "TWL4030", | 87 | .stream_name = "TWL4030", |
88 | .cpu_dai = &omap_mcbsp_dai[0], | 88 | .cpu_dai = &omap_mcbsp_dai[0], |
89 | .codec_dai = &twl4030_dai, | 89 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
90 | .ops = &omap2evm_ops, | 90 | .ops = &omap2evm_ops, |
91 | }; | 91 | }; |
92 | 92 | ||
diff --git a/sound/soc/omap/omap3beagle.c b/sound/soc/omap/omap3beagle.c index fd24a4acd2f..6aa428e07d8 100644 --- a/sound/soc/omap/omap3beagle.c +++ b/sound/soc/omap/omap3beagle.c | |||
@@ -83,7 +83,7 @@ static struct snd_soc_dai_link omap3beagle_dai = { | |||
83 | .name = "TWL4030", | 83 | .name = "TWL4030", |
84 | .stream_name = "TWL4030", | 84 | .stream_name = "TWL4030", |
85 | .cpu_dai = &omap_mcbsp_dai[0], | 85 | .cpu_dai = &omap_mcbsp_dai[0], |
86 | .codec_dai = &twl4030_dai, | 86 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
87 | .ops = &omap3beagle_ops, | 87 | .ops = &omap3beagle_ops, |
88 | }; | 88 | }; |
89 | 89 | ||
diff --git a/sound/soc/omap/omap3pandora.c b/sound/soc/omap/omap3pandora.c index fe282d4ef42..ad219aaf7cb 100644 --- a/sound/soc/omap/omap3pandora.c +++ b/sound/soc/omap/omap3pandora.c | |||
@@ -228,14 +228,14 @@ static struct snd_soc_dai_link omap3pandora_dai[] = { | |||
228 | .name = "PCM1773", | 228 | .name = "PCM1773", |
229 | .stream_name = "HiFi Out", | 229 | .stream_name = "HiFi Out", |
230 | .cpu_dai = &omap_mcbsp_dai[0], | 230 | .cpu_dai = &omap_mcbsp_dai[0], |
231 | .codec_dai = &twl4030_dai, | 231 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
232 | .ops = &omap3pandora_out_ops, | 232 | .ops = &omap3pandora_out_ops, |
233 | .init = omap3pandora_out_init, | 233 | .init = omap3pandora_out_init, |
234 | }, { | 234 | }, { |
235 | .name = "TWL4030", | 235 | .name = "TWL4030", |
236 | .stream_name = "Line/Mic In", | 236 | .stream_name = "Line/Mic In", |
237 | .cpu_dai = &omap_mcbsp_dai[1], | 237 | .cpu_dai = &omap_mcbsp_dai[1], |
238 | .codec_dai = &twl4030_dai, | 238 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
239 | .ops = &omap3pandora_in_ops, | 239 | .ops = &omap3pandora_in_ops, |
240 | .init = omap3pandora_in_init, | 240 | .init = omap3pandora_in_init, |
241 | } | 241 | } |
diff --git a/sound/soc/omap/overo.c b/sound/soc/omap/overo.c index a72dc4e159e..ec4f8fd8b3a 100644 --- a/sound/soc/omap/overo.c +++ b/sound/soc/omap/overo.c | |||
@@ -83,7 +83,7 @@ static struct snd_soc_dai_link overo_dai = { | |||
83 | .name = "TWL4030", | 83 | .name = "TWL4030", |
84 | .stream_name = "TWL4030", | 84 | .stream_name = "TWL4030", |
85 | .cpu_dai = &omap_mcbsp_dai[0], | 85 | .cpu_dai = &omap_mcbsp_dai[0], |
86 | .codec_dai = &twl4030_dai, | 86 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
87 | .ops = &overo_ops, | 87 | .ops = &overo_ops, |
88 | }; | 88 | }; |
89 | 89 | ||
diff --git a/sound/soc/omap/sdp3430.c b/sound/soc/omap/sdp3430.c index 10f1c867f11..1c7974101a0 100644 --- a/sound/soc/omap/sdp3430.c +++ b/sound/soc/omap/sdp3430.c | |||
@@ -197,7 +197,7 @@ static struct snd_soc_dai_link sdp3430_dai = { | |||
197 | .name = "TWL4030", | 197 | .name = "TWL4030", |
198 | .stream_name = "TWL4030", | 198 | .stream_name = "TWL4030", |
199 | .cpu_dai = &omap_mcbsp_dai[0], | 199 | .cpu_dai = &omap_mcbsp_dai[0], |
200 | .codec_dai = &twl4030_dai, | 200 | .codec_dai = &twl4030_dai[TWL4030_DAI_HIFI], |
201 | .init = sdp3430_twl4030_init, | 201 | .init = sdp3430_twl4030_init, |
202 | .ops = &sdp3430_ops, | 202 | .ops = &sdp3430_ops, |
203 | }; | 203 | }; |