ASoC: OpenRD Client : Fix naming breakage due to multicomponent support

multicomponent support added/changed some device name but added some typos,
breaking existing OpenRD Client support.

Signed-off-by: Arnaud Patard <arnaud.patard@rtp-net.org>
Acked-by: Liam Girdwood <lrg@slimlogic.co.uk>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 0f6ee32678efb70dff89414a9b0b4113bc835c21..51ff23b72d3a3e8d6982b031dd36df0c3c1cc711 100644 (file)
--- a/arch/arm/mach-kirkwood/common.c
+++ b/arch/arm/mach-kirkwood/common.c
@@ -904,7 +904,7 @@ static struct platform_device kirkwood_i2s_device = {
 };
 
 static struct platform_device kirkwood_pcm_device = {
-       .name           = "kirkwood-pcm",
+       .name           = "kirkwood-pcm-audio",
        .id             = -1,
 };
 

diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c
index 8a25743870c21ae880b4fab027ab07fb2f478196..39fbcff202585e8577569a7ccb8ec4f4de4ce767 100644 (file)
--- a/sound/soc/codecs/cs42l51.c
+++ b/sound/soc/codecs/cs42l51.c
@@ -622,7 +622,7 @@ MODULE_DEVICE_TABLE(i2c, cs42l51_id);
 
 static struct i2c_driver cs42l51_i2c_driver = {
        .driver = {
-               .name = "cs42L51-codec",
+               .name = "cs42l51-codec",
                .owner = THIS_MODULE,
        },
        .id_table = cs42l51_id,

diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c
index cc1a1e277edf384bba0c4f1b67dcfc7684dfc3c8..2cf76dfd035565831531014dc339b7a021ba8175 100644 (file)
--- a/sound/soc/kirkwood/kirkwood-openrd.c
+++ b/sound/soc/kirkwood/kirkwood-openrd.c
@@ -66,7 +66,7 @@ static struct snd_soc_dai_link openrd_client_dai[] = {
        .stream_name = "CS42L51 HiFi",
        .cpu_dai_name = "kirkwood-i2s",
        .platform_name = "kirkwood-pcm-audio",
-       .codec_dai_name = "cs42l51_hifi",
+       .codec_dai_name = "cs42l51-hifi",
        .codec_name = "cs42l51-codec.0-004a",
        .ops = &openrd_client_ops,
 },