summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArnaud Patard (Rtp) <arnaud.patard@rtp-net.org>2010-08-30 16:00:05 +0200
committerMark Brown <broonie@opensource.wolfsonmicro.com>2010-08-31 13:35:15 +0100
commitc88e7b93a80bd46899c4cb09a9b2d52bb04d79bd (patch)
tree77a95f72ec3946874b380f82a0da0c5b5447c681
parent2c280320f22153f7035a76ee0948f5577c5482b5 (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.c2
-rw-r--r--sound/soc/codecs/cs42l51.c2
-rw-r--r--sound/soc/kirkwood/kirkwood-openrd.c2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c
index 0f6ee32678e..51ff23b72d3 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 = {
};
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 8a25743870c..39fbcff2025 100644
--- 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 cc1a1e277ed..2cf76dfd035 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[] = {
.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,
},