ASoC: eukrea-tlv320: Convert it to platform driver

Convert eukrea-tlv320 to platform driver.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>

diff --git a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
index fd3177f9e79ad2be616fb4d70b1f71f48daf9fdf..98aef571b9f839de8111cb8cb19e3dfe595b5adb 100644 (file)
--- a/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimx27-baseboard.c
@@ -348,4 +348,5 @@ void __init eukrea_mbimx27_baseboard_init(void)
        imx27_add_imx_keypad(&eukrea_mbimx27_keymap_data);
 
        gpio_led_register_device(-1, &eukrea_mbimx27_gpio_led_info);
+       imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0);
 }

diff --git a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
index dfd2da87c2df1e3214a6fac5bfca0ec18dee3193..0b84666792f05f7192954b3a57b2256d7e341031 100644 (file)
--- a/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c
@@ -306,4 +306,5 @@ void __init eukrea_mbimxsd25_baseboard_init(void)
        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
        gpio_led_register_device(-1, &eukrea_mbimxsd_led_info);
        imx_add_gpio_keys(&eukrea_mbimxsd_button_data);
+       imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0);
 }

diff --git a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
index 6e9dd12a6961cf8bf7e6fc8cf8053a12ca13fd32..c6532a007d468ae68658c213d3656ee483cc2dfd 100644 (file)
--- a/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c
@@ -315,4 +315,5 @@ void __init eukrea_mbimxsd35_baseboard_init(void)
        platform_add_devices(platform_devices, ARRAY_SIZE(platform_devices));
        gpio_led_register_device(-1, &eukrea_mbimxsd_led_info);
        imx_add_gpio_keys(&eukrea_mbimxsd_button_data);
+       imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0);
 }

diff --git a/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
index 96a24b73dc2309fc109c346524d22e39b84e3b67..8b0de30d7a3f3d2dba60032367b4b548657804b4 100644 (file)
--- a/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
+++ b/arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c
@@ -228,4 +228,5 @@ void __init eukrea_mbimxsd51_baseboard_init(void)
 
        gpio_led_register_device(-1, &eukrea_mbimxsd51_led_info);
        imx_add_gpio_keys(&eukrea_mbimxsd51_button_data);
+       imx_add_platform_device("eukrea_tlv320", 0, NULL, 0, NULL, 0);
 }

diff --git a/sound/soc/fsl/eukrea-tlv320.c b/sound/soc/fsl/eukrea-tlv320.c
index efb9ede01208f8cbe6f66b597f1253ecd780e96f..267d5b4b63ceb8392c9bd1433e2f1f6c288b92cf 100644 (file)
--- a/sound/soc/fsl/eukrea-tlv320.c
+++ b/sound/soc/fsl/eukrea-tlv320.c
@@ -93,9 +93,7 @@ static struct snd_soc_card eukrea_tlv320 = {
        .num_links      = 1,
 };
 
-static struct platform_device *eukrea_tlv320_snd_device;
-
-static int __init eukrea_tlv320_init(void)
+static int __devinit eukrea_tlv320_probe(struct platform_device *pdev)
 {
        int ret;
        int int_port = 0, ext_port;
@@ -136,29 +134,32 @@ static int __init eukrea_tlv320_init(void)
                return 0;
        }
 
-       eukrea_tlv320_snd_device = platform_device_alloc("soc-audio", -1);
-       if (!eukrea_tlv320_snd_device)
-               return -ENOMEM;
-
-       platform_set_drvdata(eukrea_tlv320_snd_device, &eukrea_tlv320);
-       ret = platform_device_add(eukrea_tlv320_snd_device);
-
-       if (ret) {
-               printk(KERN_ERR "ASoC: Platform device allocation failed\n");
-               platform_device_put(eukrea_tlv320_snd_device);
-       }
+       eukrea_tlv320.dev = &pdev->dev;
+       ret = snd_soc_register_card(&eukrea_tlv320);
+       if (ret)
+               dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
 
        return ret;
 }
 
-static void __exit eukrea_tlv320_exit(void)
+static int __devexit eukrea_tlv320_remove(struct platform_device *pdev)
 {
-       platform_device_unregister(eukrea_tlv320_snd_device);
+       snd_soc_unregister_card(&eukrea_tlv320);
+
+       return 0;
 }
 
-module_init(eukrea_tlv320_init);
-module_exit(eukrea_tlv320_exit);
+static struct platform_driver eukrea_tlv320_driver = {
+       .driver = {
+               .name = "eukrea_tlv320",
+               .owner = THIS_MODULE,
+       },
+       .probe = eukrea_tlv320_probe,
+       .remove = __devexit_p(eukrea_tlv320_remove),};
+
+module_platform_driver(eukrea_tlv320_driver);
 
 MODULE_AUTHOR("Eric Bénard <eric@eukrea.com>");
 MODULE_DESCRIPTION("CPUIMX ALSA SoC driver");
 MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:eukrea_tlv320");