瀏覽代碼

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>
Arnaud Patard (Rtp) 15 年之前
父節點
當前提交
c88e7b93a8
共有 3 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      arch/arm/mach-kirkwood/common.c
  2. 1 1
      sound/soc/codecs/cs42l51.c
  3. 1 1
      sound/soc/kirkwood/kirkwood-openrd.c

+ 1 - 1
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,
 };
 

+ 1 - 1
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,

+ 1 - 1
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,
 },