Commit 5250a503 authored by Mark Brown's avatar Mark Brown

ASoC: Fix WM8978/migor driver name conflict

Standardise on 'wm8978' as the name for the CODEC.
Reported-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Acked-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent b9fde18c
...@@ -1038,7 +1038,7 @@ MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id); ...@@ -1038,7 +1038,7 @@ MODULE_DEVICE_TABLE(i2c, wm8978_i2c_id);
static struct i2c_driver wm8978_i2c_driver = { static struct i2c_driver wm8978_i2c_driver = {
.driver = { .driver = {
.name = "WM8978-codec", .name = "wm8978",
.owner = THIS_MODULE, .owner = THIS_MODULE,
}, },
.probe = wm8978_i2c_probe, .probe = wm8978_i2c_probe,
......
...@@ -156,7 +156,7 @@ static struct snd_soc_dai_link migor_dai = { ...@@ -156,7 +156,7 @@ static struct snd_soc_dai_link migor_dai = {
.cpu_dai_name = "siu-i2s-dai", .cpu_dai_name = "siu-i2s-dai",
.codec_dai_name = "wm8978-hifi", .codec_dai_name = "wm8978-hifi",
.platform_name = "siu-pcm-audio", .platform_name = "siu-pcm-audio",
.codec_name = "wm8978-codec.0-001a", .codec_name = "wm8978.0-001a",
.ops = &migor_dai_ops, .ops = &migor_dai_ops,
.init = migor_dai_init, .init = migor_dai_init,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment