[PATCH 1/1] ASoC: Samsung: Convert to use snd_soc_register_card()

[PATCH 1/1] ASoC: Samsung: Convert to use snd_soc_register_card()

[Sachin Kamat]

Current method for machine driver to register with the ASoC core is to use
snd_soc_register_card() instead of creating a "soc-audio" platform device.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 sound/soc/samsung/smdk_wm8994.c |   36 +++++++++++++++++++++++-------------
 1 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/sound/soc/samsung/smdk_wm8994.c b/sound/soc/samsung/smdk_wm8994.c
index 8eb309f..3ea3098 100644
--- a/sound/soc/samsung/smdk_wm8994.c
+++ b/sound/soc/samsung/smdk_wm8994.c
@@ -149,31 +149,41 @@ static struct snd_soc_card smdk = {
 	.num_links = ARRAY_SIZE(smdk_dai),
 };
 
-static struct platform_device *smdk_snd_device;
 
-static int __init smdk_audio_init(void)
+static int __devinit smdk_audio_probe(struct platform_device *pdev)
 {
 	int ret;
+	struct snd_soc_card *card = &smdk;
 
-	smdk_snd_device = platform_device_alloc("soc-audio", -1);
-	if (!smdk_snd_device)
-		return -ENOMEM;
+	card->dev = &pdev->dev;
+	ret = snd_soc_register_card(card);
 
-	platform_set_drvdata(smdk_snd_device, &smdk);
-
-	ret = platform_device_add(smdk_snd_device);
 	if (ret)
-		platform_device_put(smdk_snd_device);
+		dev_err(&pdev->dev, "snd_soc_register_card() failed:%d\n", ret);
 
 	return ret;
 }
-module_init(smdk_audio_init);
 
-static void __exit smdk_audio_exit(void)
+static int __devexit smdk_audio_remove(struct platform_device *pdev)
 {
-	platform_device_unregister(smdk_snd_device);
+	struct snd_soc_card *card = platform_get_drvdata(pdev);
+
+	snd_soc_unregister_card(card);
+
+	return 0;
 }
-module_exit(smdk_audio_exit);
+
+static struct platform_driver smdk_audio_driver = {
+	.driver		= {
+		.name	= "smdk-audio",
+		.owner	= THIS_MODULE,
+	},
+	.probe		= smdk_audio_probe,
+	.remove		= __devexit_p(smdk_audio_remove),
+};
+
+module_platform_driver(smdk_audio_driver);
 
 MODULE_DESCRIPTION("ALSA SoC SMDK WM8994");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:smdk-audio");
-- 
1.7.4.1

RE: [PATCH 1/1] ASoC: Samsung: Convert to use snd_soc_register_card()

[Sangbeom Kim]

Hi!
On Tuesday, Jul 03, 2012 at 05:34PM, Sachin Kamat wrote:
> Current method for machine driver to register with the ASoC core is to use
> snd_soc_register_card() instead of creating a "soc-audio" platform device.

It looks better to include reason of using snd_soc_register_card
instead of creating "soc-audio" or warning message.

Acked-by: Sangbeom Kim <sbkim73@samsung.com>

Re: [PATCH 1/1] ASoC: Samsung: Convert to use snd_soc_register_card()

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 302 bytes --]

On Tue, Jul 03, 2012 at 02:04:04PM +0530, Sachin Kamat wrote:
> Current method for machine driver to register with the ASoC core is to use
> snd_soc_register_card() instead of creating a "soc-audio" platform device.

Applied, thanks (it's not a generic Samsung patch, it's just for the one
board BTW).

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]

RE: [PATCH 1/3] ARM: EXYNOS: Add audio platform device in SMDKV310 board

[Sangbeom Kim]

Hi!
On Tuesday, Jul 05, 2012 at 09:01:56, Sachin Kamat wrote:
> After using snd_soc_register_card() in smdk_wm8994.c, the sound
> card is registered as a platform driver and it needs related platform
> device entry in machine file.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org> 
Acked-by: Sangbeom Kim <sbkim73@samsung.com>
 
Thanks,
Sangbeom.

RE: [PATCH 2/3] ARM: S5PV210: Add audio platform device in Aquila board

[Sangbeom Kim]

Hi!
On Thu, Jul 05, 2012 at 09:01:57, Sachin Kamat wrote:
> After using snd_soc_register_card() in smdk_wm8994.c, the sound
> card is registered as a platform driver and it needs related platform
> device entry in machine file.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>

Thanks,
Sangbeom.

RE: [PATCH 3/3] ARM: S5PV210: Add audio platform device in Goni board

[Sangbeom Kim]

On Thu, Jul 05, 2012 at 09:01:58, Sachin Kamat wrote:
> After using snd_soc_register_card() in smdk_wm8994.c, the sound
> card is registered as a platform driver and it needs related platform
> device entry in machine file.
>
> Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Acked-by: Sangbeom Kim <sbkim73@samsung.com>

Thanks,
Sangbeom.

[PATCH 0/3] Add audio platform device to S5PV210 and Exynos4 boards

[Sachin Kamat]

The following patch added snd_soc_register_card() functionality
instead of creating a "soc-audio" platform device in smdk_wm8994.c file.

http://www.spinics.net/lists/linux-samsung-soc/msg11232.html

After using snd_soc_register_card(), the sound card is registered as a
platform driver and it needs related platform device entry in machine file.

Thus this patch series is dependent on the above patch.
This series is based on Kukjin Kim's for-next branch.

Sachin Kamat (3):
  ARM: EXYNOS: Add audio platform device in SMDKV310 board
  ARM: S5PV210: Add audio platform device in Aquila board
  ARM: S5PV210: Add audio platform device in Goni board

 arch/arm/mach-exynos/mach-smdkv310.c |    7 +++++++
 arch/arm/mach-s5pv210/mach-aquila.c  |    7 +++++++
 arch/arm/mach-s5pv210/mach-goni.c    |    7 +++++++
 3 files changed, 21 insertions(+), 0 deletions(-)

-- 
1.7.4.1

[PATCH 2/3] ARM: S5PV210: Add audio platform device in Aquila board

[Sachin Kamat]

After using snd_soc_register_card() in smdk_wm8994.c, the sound
card is registered as a platform driver and it needs related platform
device entry in machine file.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
---
 arch/arm/mach-s5pv210/mach-aquila.c |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/arch/arm/mach-s5pv210/mach-aquila.c b/arch/arm/mach-s5pv210/mach-aquila.c
index af528f9..78028df 100644
--- a/arch/arm/mach-s5pv210/mach-aquila.c
+++ b/arch/arm/mach-s5pv210/mach-aquila.c
@@ -600,10 +600,17 @@ static void aquila_setup_sdhci(void)
 	s3c_sdhci2_set_platdata(&aquila_hsmmc2_data);
 };
 
+/* Audio device */
+static struct platform_device aquila_device_audio = {
+	.name = "smdk-audio",
+	.id = -1,
+};
+
 static struct platform_device *aquila_devices[] __initdata = {
 	&aquila_i2c_gpio_pmic,
 	&aquila_i2c_gpio5,
 	&aquila_device_gpiokeys,
+	&aquila_device_audio,
 	&s3c_device_fb,
 	&s5p_device_onenand,
 	&s3c_device_hsmmc0,
-- 
1.7.4.1