aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2012-05-04 17:47:00 +1000
committerNeilBrown <neilb@suse.de>2013-05-24 16:44:15 +1000
commitd95bd2aed8c76cce4a1e57154a2f520f5740f331 (patch)
tree7cd8e75cc0eeff07ba36923b6ce16f2ceccbc6fa /sound
parentbd5e79e5f165f5948d0b600ef513fb7b60d12939 (diff)
downloadkernel_goldelico_gta04-d95bd2aed8c76cce4a1e57154a2f520f5740f331.zip
kernel_goldelico_gta04-d95bd2aed8c76cce4a1e57154a2f520f5740f331.tar.gz
kernel_goldelico_gta04-d95bd2aed8c76cce4a1e57154a2f520f5740f331.tar.bz2
GTA04-codecs: updates for new DAI names.
The names have changed - we must adjust Signed-off-by: NeilBrown <neilb@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/omap/gta04-audio.c2
-rw-r--r--sound/soc/omap/gta04-fm.c2
-rw-r--r--sound/soc/omap/gta04-headset.c2
-rw-r--r--sound/soc/omap/gta04-voice.c2
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c
index e5a8354..67867f0 100644
--- a/sound/soc/omap/gta04-audio.c
+++ b/sound/soc/omap/gta04-audio.c
@@ -184,7 +184,7 @@ static struct snd_soc_ops omap3gta04_ops = {
static struct snd_soc_dai_link omap3gta04_dai = {
.name = "TWL4030",
.stream_name = "TWL4030",
- .cpu_dai_name = "omap-mcbsp-dai.1",
+ .cpu_dai_name = "omap-mcbsp.2",
.platform_name = "omap-pcm-audio",
.codec_dai_name = "twl4030-hifi",
.codec_name = "twl4030-codec",
diff --git a/sound/soc/omap/gta04-fm.c b/sound/soc/omap/gta04-fm.c
index 036c0dd..228a8b0 100644
--- a/sound/soc/omap/gta04-fm.c
+++ b/sound/soc/omap/gta04-fm.c
@@ -91,7 +91,7 @@ static struct snd_soc_ops gta04_fm_ops = {
static struct snd_soc_dai_link gta04_fm_dai = {
.name = "Si47xx",
.stream_name = "Si47xx",
- .cpu_dai_name = "omap-mcbsp-dai.0",
+ .cpu_dai_name = "omap-mcbsp.1",
.platform_name = "omap-pcm-audio",
.codec_dai_name = "Si47xx",
.init = gta04_fm_init,
diff --git a/sound/soc/omap/gta04-headset.c b/sound/soc/omap/gta04-headset.c
index 3c19f08f..d266492 100644
--- a/sound/soc/omap/gta04-headset.c
+++ b/sound/soc/omap/gta04-headset.c
@@ -91,7 +91,7 @@ static struct snd_soc_ops gta04_headset_ops = {
static struct snd_soc_dai_link gta04_headset_dai = {
.name = "W2CBW003",
.stream_name = "W2CBW003",
- .cpu_dai_name = "omap-mcbsp-dai.2",
+ .cpu_dai_name = "omap-mcbsp.3",
.platform_name = "omap-pcm-audio",
.codec_dai_name = "W2CBW003",
.codec_name = "w2cbw003_codec_audio",
diff --git a/sound/soc/omap/gta04-voice.c b/sound/soc/omap/gta04-voice.c
index e02fb00..40e672e 100644
--- a/sound/soc/omap/gta04-voice.c
+++ b/sound/soc/omap/gta04-voice.c
@@ -118,7 +118,7 @@ static struct snd_soc_ops gta04_voice_ops = {
static struct snd_soc_dai_link gta04_voice_dai = {
.name = "GTM601",
.stream_name = "GTM601",
- .cpu_dai_name = "omap-mcbsp-dai.3",
+ .cpu_dai_name = "omap-mcbsp.4",
.platform_name = "omap-pcm-audio",
.codec_dai_name = "GTM601",
.codec_name = "gtm601_codec_audio",