diff options
author | Arnaud Patard (Rtp) <arnaud.patard@rtp-net.org> | 2010-08-30 10:00:05 -0400 |
---|---|---|
committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2010-08-31 08:35:15 -0400 |
commit | c88e7b93a80bd46899c4cb09a9b2d52bb04d79bd (patch) | |
tree | 77a95f72ec3946874b380f82a0da0c5b5447c681 | |
parent | 2c280320f22153f7035a76ee0948f5577c5482b5 (diff) |
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>
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 2 | ||||
-rw-r--r-- | sound/soc/codecs/cs42l51.c | 2 | ||||
-rw-r--r-- | sound/soc/kirkwood/kirkwood-openrd.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index 0f6ee32678ef..51ff23b72d3a 100644 --- 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 = { | |||
904 | }; | 904 | }; |
905 | 905 | ||
906 | static struct platform_device kirkwood_pcm_device = { | 906 | static struct platform_device kirkwood_pcm_device = { |
907 | .name = "kirkwood-pcm", | 907 | .name = "kirkwood-pcm-audio", |
908 | .id = -1, | 908 | .id = -1, |
909 | }; | 909 | }; |
910 | 910 | ||
diff --git a/sound/soc/codecs/cs42l51.c b/sound/soc/codecs/cs42l51.c index 8a25743870c2..39fbcff20258 100644 --- a/sound/soc/codecs/cs42l51.c +++ b/sound/soc/codecs/cs42l51.c | |||
@@ -622,7 +622,7 @@ MODULE_DEVICE_TABLE(i2c, cs42l51_id); | |||
622 | 622 | ||
623 | static struct i2c_driver cs42l51_i2c_driver = { | 623 | static struct i2c_driver cs42l51_i2c_driver = { |
624 | .driver = { | 624 | .driver = { |
625 | .name = "cs42L51-codec", | 625 | .name = "cs42l51-codec", |
626 | .owner = THIS_MODULE, | 626 | .owner = THIS_MODULE, |
627 | }, | 627 | }, |
628 | .id_table = cs42l51_id, | 628 | .id_table = cs42l51_id, |
diff --git a/sound/soc/kirkwood/kirkwood-openrd.c b/sound/soc/kirkwood/kirkwood-openrd.c index cc1a1e277edf..2cf76dfd0355 100644 --- 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[] = { | |||
66 | .stream_name = "CS42L51 HiFi", | 66 | .stream_name = "CS42L51 HiFi", |
67 | .cpu_dai_name = "kirkwood-i2s", | 67 | .cpu_dai_name = "kirkwood-i2s", |
68 | .platform_name = "kirkwood-pcm-audio", | 68 | .platform_name = "kirkwood-pcm-audio", |
69 | .codec_dai_name = "cs42l51_hifi", | 69 | .codec_dai_name = "cs42l51-hifi", |
70 | .codec_name = "cs42l51-codec.0-004a", | 70 | .codec_name = "cs42l51-codec.0-004a", |
71 | .ops = &openrd_client_ops, | 71 | .ops = &openrd_client_ops, |
72 | }, | 72 | }, |