diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-05-06 23:06:37 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-05-07 03:15:50 +0200 |
| commit | 71517579711336bdc1aea2b8965b9c0324e9746f (patch) | |
| tree | 0db89a5d51dfce087cf8c117b3556b09f8371157 | |
| parent | 6487043be1af016dea415f61d6c33cacbe3994ef (diff) | |
| download | kernel_goldelico_gta04-71517579711336bdc1aea2b8965b9c0324e9746f.zip kernel_goldelico_gta04-71517579711336bdc1aea2b8965b9c0324e9746f.tar.gz kernel_goldelico_gta04-71517579711336bdc1aea2b8965b9c0324e9746f.tar.bz2 | |
Revert "GTA04-codecs: updates for new DAI names."
This commit makes the gta04 sound card probe
(but not the gta04-voice and gta04-headset).
This reverts commit 1b0dad0c66906c3f731e9d7b43729984e81a4386.
| -rw-r--r-- | sound/soc/omap/gta04-audio.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-fm.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-headset.c | 2 | ||||
| -rw-r--r-- | sound/soc/omap/gta04-voice.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/sound/soc/omap/gta04-audio.c b/sound/soc/omap/gta04-audio.c index b6c5c6f..8d802d1 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.2", + .cpu_dai_name = "omap-mcbsp-dai.1", .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 228a8b0..036c0dd 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.1", + .cpu_dai_name = "omap-mcbsp-dai.0", .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 d266492..3c19f08f 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.3", + .cpu_dai_name = "omap-mcbsp-dai.2", .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 40e672e..e02fb00 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.4", + .cpu_dai_name = "omap-mcbsp-dai.3", .platform_name = "omap-pcm-audio", .codec_dai_name = "GTM601", .codec_name = "gtm601_codec_audio", |