From: Bo Shen <voice.shen@atmel.com>
To: broonie@opensource.wolfsonmicro.com, nicolas.ferre@atmel.com
Cc: linux-arm-kernel@lists.infradead.org,
devicetree-discuss@lists.ozlabs.org, linux-sound@vger.kernel.org,
alsa-devel@alsa-project.org, plagnioj@jcrosoft.com,
jm.lin@atmel.com, Bo Shen <voice.shen@atmel.com>
Subject: [PATCH 5/5] ASoC: sam9g20_wm8731: fix the issue for non-DT kernel
Date: Mon, 22 Oct 2012 10:17:59 +0000 [thread overview]
Message-ID: <1350901079-18307-5-git-send-email-voice.shen@atmel.com> (raw)
In-Reply-To: <1350901079-18307-1-git-send-email-voice.shen@atmel.com>
When register platform from DAIs, the platform device to PCM no longer
needed. So, fix it with this patch
Signed-off-by: Bo Shen <voice.shen@atmel.com>
---
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
next prev parent reply other threads:[~2012-10-22 10:17 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-22 10:17 [PATCH 1/5] ARM: at91: atmel-ssc: add platform device id table Bo Shen
2012-10-22 10:17 ` [PATCH 2/5] ARM: at91: atmel-ssc: add device tree support Bo Shen
2012-10-30 17:13 ` Nicolas Ferre
2012-10-22 10:17 ` [PATCH 3/5] ASoC: atmel-ssc-dai: register 'platform' from DAIs Bo Shen
2012-10-22 10:17 ` [PATCH 4/5] ASoC: sam9g20_wm8731: convert to device tree support Bo Shen
2012-10-27 22:12 ` Mark Brown
2012-10-29 6:38 ` Bo Shen
2012-10-22 10:17 ` Bo Shen [this message]
2012-10-27 22:14 ` [PATCH 5/5] ASoC: sam9g20_wm8731: fix the issue for non-DT kernel Mark Brown
2012-10-29 6:15 ` Bo Shen
2012-10-30 16:07 ` [PATCH 1/5] ARM: at91: atmel-ssc: add platform device id table Mark Brown
2012-10-30 17:14 ` Nicolas Ferre
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350901079-18307-5-git-send-email-voice.shen@atmel.com \
--to=voice.shen@atmel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@opensource.wolfsonmicro.com \
--cc=devicetree-discuss@lists.ozlabs.org \
--cc=jm.lin@atmel.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-sound@vger.kernel.org \
--cc=nicolas.ferre@atmel.com \
--cc=plagnioj@jcrosoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox