[PATCH 5/5] ASoC: sam9g20_wm8731: fix the issue for non-DT kernel
From: Bo Shen <hidden>
Date: 2012-10-22 10:17:59
Also in:
alsa-devel, linux-arm-kernel, linux-sound
Subsystem:
arm port, arm/microchip (at91) soc support, sound, sound - soc layer / dynamic audio power management (asoc), the rest · Maintainers:
Russell King, Nicolas Ferre, Alexandre Belloni, Claudiu Beznea, Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown, Linus Torvalds
When register platform from DAIs, the platform device to PCM no longer needed. So, fix it with this patch Signed-off-by: Bo Shen <redacted> --- arch/arm/mach-at91/board-sam9g20ek.c | 6 ------ sound/soc/atmel/sam9g20_wm8731.c | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/arm/mach-at91/board-sam9g20ek.c b/arch/arm/mach-at91/board-sam9g20ek.c
index 5b6a6f9..ebdbf42 100644
--- a/arch/arm/mach-at91/board-sam9g20ek.c
+++ b/arch/arm/mach-at91/board-sam9g20ek.c@@ -353,11 +353,6 @@ static struct i2c_board_info __initdata ek_i2c_devices[] = { }, }; -static struct platform_device sam9g20ek_pcm_device = { - .name = "atmel-pcm-audio", - .id = -1, -}; - static struct platform_device sam9g20ek_audio_device = { .name = "at91sam9g20ek-audio", .id = -1,
@@ -365,7 +360,6 @@ static struct platform_device sam9g20ek_audio_device = { static void __init ek_add_device_audio(void) { - platform_device_register(&sam9g20ek_pcm_device); platform_device_register(&sam9g20ek_audio_device); }
diff --git a/sound/soc/atmel/sam9g20_wm8731.c b/sound/soc/atmel/sam9g20_wm8731.c
index 187dc65..0c5987a 100644
--- a/sound/soc/atmel/sam9g20_wm8731.c
+++ b/sound/soc/atmel/sam9g20_wm8731.c@@ -182,7 +182,7 @@ static struct snd_soc_dai_link at91sam9g20ek_dai = { .cpu_dai_name = "atmel-ssc-dai.0", .codec_dai_name = "wm8731-hifi", .init = at91sam9g20ek_wm8731_init, - .platform_name = "atmel-pcm-audio", + .platform_name = "atmel-ssc-dai.0", .codec_name = "wm8731.0-001b", .ops = &at91sam9g20ek_ops, };
--
1.7.9.5