diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2011-03-28 09:45:08 +0400 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-03-30 02:17:46 +0400 |
| commit | c8ad38b8b26ad04d5125606065c87315308d6df5 (patch) | |
| tree | b939a0ca647705d31c0b045374f064f1c90af64f | |
| parent | f04cd9cb11469a6a9cbfdad824254143250d78d2 (diff) | |
| download | linux-c8ad38b8b26ad04d5125606065c87315308d6df5.tar.xz | |
ASoC: Blackfin: drop "-codec" from codec names
The recent multi-component patch incorrectly added "-codec" suffixes to
parts which are not MFD. Drop the suffix from the machine drivers too.
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Liam Girdwood <lrg@ti.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad1836.c | 2 | ||||
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad193x.c | 2 | ||||
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad1980.c | 2 | ||||
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ad73311.c | 2 | ||||
| -rw-r--r-- | sound/soc/blackfin/bf5xx-ssm2602.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/sound/soc/blackfin/bf5xx-ad1836.c b/sound/soc/blackfin/bf5xx-ad1836.c index 83012da9dfc2..826bae696d36 100644 --- a/sound/soc/blackfin/bf5xx-ad1836.c +++ b/sound/soc/blackfin/bf5xx-ad1836.c @@ -85,7 +85,7 @@ static struct snd_soc_dai_link bf5xx_ad1836_dai = { .cpu_dai_name = "bf5xx-tdm", .codec_dai_name = "ad1836-hifi", .platform_name = "bf5xx-tdm-pcm-audio", - .codec_name = "ad1836-codec.0", + .codec_name = "ad1836.0", .ops = &bf5xx_ad1836_ops, }; diff --git a/sound/soc/blackfin/bf5xx-ad193x.c b/sound/soc/blackfin/bf5xx-ad193x.c index 33678828d57e..5794d094d003 100644 --- a/sound/soc/blackfin/bf5xx-ad193x.c +++ b/sound/soc/blackfin/bf5xx-ad193x.c @@ -113,7 +113,7 @@ static struct snd_soc_dai_link bf5xx_ad193x_dai = { .cpu_dai_name = "bf5xx-tdm", .codec_dai_name ="ad193x-hifi", .platform_name = "bf5xx-tdm-pcm-audio", - .codec_name = "ad193x-codec.5", + .codec_name = "ad193x.5", .ops = &bf5xx_ad193x_ops, }; diff --git a/sound/soc/blackfin/bf5xx-ad1980.c b/sound/soc/blackfin/bf5xx-ad1980.c index d57c9c9c9883..c147130a2e7e 100644 --- a/sound/soc/blackfin/bf5xx-ad1980.c +++ b/sound/soc/blackfin/bf5xx-ad1980.c @@ -73,7 +73,7 @@ static struct snd_soc_dai_link bf5xx_board_dai = { .cpu_dai_name = "bfin-ac97", .codec_dai_name = "ad1980-hifi", .platform_name = "bfin-pcm-audio", - .codec_name = "ad1980-codec", + .codec_name = "ad1980", .ops = &bf5xx_board_ops, }; diff --git a/sound/soc/blackfin/bf5xx-ad73311.c b/sound/soc/blackfin/bf5xx-ad73311.c index 732fb8bad076..1655f950dfb4 100644 --- a/sound/soc/blackfin/bf5xx-ad73311.c +++ b/sound/soc/blackfin/bf5xx-ad73311.c @@ -186,7 +186,7 @@ static struct snd_soc_dai_link bf5xx_ad73311_dai = { .cpu_dai_name = "bf5xx-i2s", .codec_dai_name = "ad73311-hifi", .platform_name = "bfin-pcm-audio", - .codec_name = "ad73311-codec", + .codec_name = "ad73311", .ops = &bf5xx_ad73311_ops, }; diff --git a/sound/soc/blackfin/bf5xx-ssm2602.c b/sound/soc/blackfin/bf5xx-ssm2602.c index ad28663f5bbd..732a02ffe68f 100644 --- a/sound/soc/blackfin/bf5xx-ssm2602.c +++ b/sound/soc/blackfin/bf5xx-ssm2602.c @@ -119,7 +119,7 @@ static struct snd_soc_dai_link bf5xx_ssm2602_dai = { .cpu_dai_name = "bf5xx-i2s", .codec_dai_name = "ssm2602-hifi", .platform_name = "bf5xx-pcm-audio", - .codec_name = "ssm2602-codec.0-001b", + .codec_name = "ssm2602.0-001b", .ops = &bf5xx_ssm2602_ops, }; |