Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da75c924 authored by Fabio Estevam's avatar Fabio Estevam Committed by Mark Brown
Browse files

ASoC: eukrea-tlv320: Convert it to platform driver 



Convert eukrea-tlv320 to platform driver.

Signed-off-by: default avatarFabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent a31ebc34

arch/arm/mach-imx/eukrea_mbimx27-baseboard.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-imx/eukrea_mbimxsd25-baseboard.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-imx/eukrea_mbimxsd35-baseboard.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

arch/arm/mach-imx/eukrea_mbimxsd51-baseboard.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

}

sound/soc/fsl/eukrea-tlv320.c

+19 −18
Original line number Diff line number Diff line
@@ -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");