WM8750: Convert to new API
Subsystems (3)
PATCH 1/1 WM8750: Convert to new API
Register the WM8750 as a SPI or I2C device. This patch mostly shuffles code around. Hugely inspired by WM8753 which was already converted.
--- sound/soc/codecs/wm8750.c | 297 +++++++++++++++++++++------------------------ 1 files changed, 140 insertions(+), 157 deletions(-)
sound/soc/codecs/wm8750.c +140 -157
@@ -29,11 +29,6 @@#include "wm8750.h" -/* codec private data */ -struct wm8750_priv { -unsigned int sysclk; -}; -/* * wm8750 register cache * We can't read the WM8750 register space when we
@@ -53,6 +48,13 @@ static const u16 wm8750_reg[] = { 0x0079, 0x0079, 0x0079, /* 40 */ }; +/* codec private data */ +struct wm8750_priv { +unsigned int sysclk; +struct snd_soc_codec codec; +u16 reg_cache[ARRAY_SIZE (wm8750_reg)]; +}; +#define wm8750_reset (c) snd_soc_write(c, WM8750_RESET, 0)/*
@@ -695,25 +697,90 @@ static int wm8750_resume(struct platform_device *pdev)return 0 ; } +static struct snd_soc_codec *wm8750_codec; + +static int wm8750_probe (struct platform_device *pdev) +{ +struct snd_soc_device *socdev =platform_get_drvdata (pdev); +struct snd_soc_codec *codec; +int ret =0 ; + +if (!wm8750_codec) { +dev_err (&pdev->dev,"WM8750 codec not yet registered\n" ); +return -EINVAL ; + } + + socdev->card->codec = wm8750_codec; + codec = wm8750_codec; + +/* register pcms */ + ret =snd_soc_new_pcms (socdev,SNDRV_DEFAULT_IDX1 ,SNDRV_DEFAULT_STR1 ); +if (ret <0 ) { +printk (KERN_ERR "wm8750: failed to create pcms\n" ); + goto err; + } + +snd_soc_add_controls (codec, wm8750_snd_controls, +ARRAY_SIZE (wm8750_snd_controls)); +wm8750_add_widgets (codec); + +return 0 ; + +err: +return ret; +} + +/* power down chip */ +static int wm8750_remove (struct platform_device *pdev) +{ +struct snd_soc_device *socdev =platform_get_drvdata (pdev); + +snd_soc_free_pcms (socdev); +snd_soc_dapm_free (socdev); + +return 0 ; +} + +struct snd_soc_codec_device soc_codec_dev_wm8750 = { + .probe = wm8750_probe, + .remove = wm8750_remove, + .suspend = wm8750_suspend, + .resume = wm8750_resume, +}; +EXPORT_SYMBOL_GPL (soc_codec_dev_wm8750); +/* * initialise the WM8750 driver * register the mixer and dsp interfaces with the kernel */ -static int wm8750_init (struct snd_soc_device *socdev, -enum snd_soc_control_type control) +static int wm8750_register (struct wm8750_priv *wm8750, +enum snd_soc_control_type control) { -struct snd_soc_codec *codec = socdev->card->codec; +struct snd_soc_codec *codec = &wm8750->codec;int reg, ret =0 ; +if (wm8750_codec) { +dev_err (codec->dev,"Multiple WM8750 devices not supported\n" ); + ret = -EINVAL ; + goto err; + } + +mutex_init (&codec->mutex); +INIT_LIST_HEAD (&codec->dapm_widgets); +INIT_LIST_HEAD (&codec->dapm_paths); + codec->name ="WM8750" ; codec->owner =THIS_MODULE ; + codec->bias_level =SND_SOC_BIAS_STANDBY ; codec->set_bias_level = wm8750_set_bias_level; codec->dai = &wm8750_dai; codec->num_dai =1 ; - codec->reg_cache_size =ARRAY_SIZE (wm8750_reg); - codec->reg_cache =kmemdup (wm8750_reg,sizeof (wm8750_reg),GFP_KERNEL ); -if (codec->reg_cache ==NULL ) -return -ENOMEM ; + codec->private_data = wm8750; + codec->reg_cache_size =ARRAY_SIZE (wm8750->reg_cache) +1 ; + codec->reg_cache = &wm8750->reg_cache; + codec->private_data = wm8750; + +memcpy (codec->reg_cache, wm8750_reg,sizeof (wm8750->reg_cache)); ret =snd_soc_codec_set_cache_io (codec,7 ,9 , control);if (ret <0 ) {
@@ -727,13 +794,6 @@ static int wm8750_init(struct snd_soc_device *socdev, goto err; } -/* register pcms */ - ret =snd_soc_new_pcms (socdev,SNDRV_DEFAULT_IDX1 ,SNDRV_DEFAULT_STR1 ); -if (ret <0 ) { -printk (KERN_ERR "wm8750: failed to create pcms\n" ); - goto err; - } -/* charge output caps */ wm8750_set_bias_level (codec,SND_SOC_BIAS_STANDBY );
@@ -755,19 +815,37 @@ static int wm8750_init(struct snd_soc_device *socdev, reg =snd_soc_read (codec,WM8750_RINVOL );snd_soc_write (codec,WM8750_RINVOL , reg |0x0100 ); -snd_soc_add_controls (codec, wm8750_snd_controls, -ARRAY_SIZE (wm8750_snd_controls)); -wm8750_add_widgets (codec); -return ret; + wm8750_codec = codec; + + ret =snd_soc_register_codec (codec); +if (ret !=0 ) { +dev_err (codec->dev,"Failed to register codec: %d\n" , ret); + goto err; + } + ret =snd_soc_register_dais (&wm8750_dai,1 ); +if (ret !=0 ) { +dev_err (codec->dev,"Failed to register DAIs: %d\n" , ret); + goto err_codec; + } + +return 0 ; + +err_codec: +snd_soc_unregister_codec (codec); err: -kfree (codec->reg_cache); +kfree (wm8750);return ret; } -/* If the i2c layer weren't so broken, we could pass this kind of data -around */ -static struct snd_soc_device *wm8750_socdev; +static void wm8750_unregister (struct wm8750_priv *wm8750) +{ +wm8750_set_bias_level (&wm8750->codec,SND_SOC_BIAS_OFF ); +snd_soc_unregister_dais (&wm8750_dai,1 ); +snd_soc_unregister_codec (&wm8750->codec); +kfree (wm8750); + wm8750_codec =NULL ; +}#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )
@@ -781,24 +859,26 @@ static struct snd_soc_device *wm8750_socdev;static int wm8750_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) { -struct snd_soc_device *socdev = wm8750_socdev; -struct snd_soc_codec *codec = socdev->card->codec; -int ret; +struct snd_soc_codec *codec; +struct wm8750_priv *wm8750; -i2c_set_clientdata (i2c, codec); - codec->control_data = i2c; + wm8750 =kzalloc (sizeof (struct wm8750_priv ),GFP_KERNEL ); +if (wm8750 ==NULL ) +return -ENOMEM ; - ret =wm8750_init (socdev,SND_SOC_I2C ); -if (ret <0 ) -pr_err ("failed to initialise WM8750\n" ); + codec = &wm8750->codec; + codec->control_data = i2c; +i2c_set_clientdata (i2c, wm8750); -return ret; + codec->dev = &i2c->dev; + +return wm8750_register (wm8750,SND_SOC_I2C ); }static int wm8750_i2c_remove (struct i2c_client *client) { -struct snd_soc_codec *codec =i2c_get_clientdata (client); -kfree (codec->reg_cache); +struct wm8750_priv *wm8750 =i2c_get_clientdata (client); +wm8750_unregister (wm8750);return 0 ; }
@@ -817,66 +897,31 @@ static struct i2c_driver wm8750_i2c_driver = { .remove = wm8750_i2c_remove, .id_table = wm8750_i2c_id, }; - -static int wm8750_add_i2c_device (struct platform_device *pdev, -const struct wm8750_setup_data *setup) -{ -struct i2c_board_info info; -struct i2c_adapter *adapter; -struct i2c_client *client; -int ret; - - ret =i2c_add_driver (&wm8750_i2c_driver); -if (ret !=0 ) { -dev_err (&pdev->dev,"can't add i2c driver\n" ); -return ret; - } - -memset (&info,0 ,sizeof (struct i2c_board_info )); - info.addr = setup->i2c_address; -strlcpy (info.type,"wm8750" ,I2C_NAME_SIZE ); - - adapter =i2c_get_adapter (setup->i2c_bus); -if (!adapter) { -dev_err (&pdev->dev,"can't get i2c adapter %d\n" , - setup->i2c_bus); - goto err_driver; - } - - client =i2c_new_device (adapter, &info); -i2c_put_adapter (adapter); -if (!client) { -dev_err (&pdev->dev,"can't add i2c device at 0x%x\n" , - (unsigned int )info.addr); - goto err_driver; - } - -return 0 ; - -err_driver: -i2c_del_driver (&wm8750_i2c_driver); -return -ENODEV ; -}#endif #if defined(CONFIG_SPI_MASTER )static int __devinit wm8750_spi_probe (struct spi_device *spi) { -struct snd_soc_device *socdev = wm8750_socdev; -struct snd_soc_codec *codec = socdev->card->codec; -int ret; +struct snd_soc_codec *codec; +struct wm8750_priv *wm8750; + + wm8750 =kzalloc (sizeof (struct wm8750_priv ),GFP_KERNEL ); +if (wm8750 ==NULL ) +return -ENOMEM ; + codec = &wm8750->codec; codec->control_data = spi; + codec->dev = &spi->dev; - ret =wm8750_init (socdev,SND_SOC_SPI ); -if (ret <0 ) -dev_err (&spi->dev,"failed to initialise WM8750\n" ); +dev_set_drvdata (&spi->dev, wm8750); -return ret; +return wm8750_register (wm8750,SND_SOC_SPI ); } static int __devexit wm8750_spi_remove(struct spi_device *spi) { +struct wm8750_priv *wm8750 =dev_get_drvdata (&spi->dev); +wm8750_unregister (wm8750);return 0 ; }
@@ -891,93 +936,31 @@ static struct spi_driver wm8750_spi_driver = { };#endif -static int wm8750_probe (struct platform_device *pdev) +static int __init wm8750_modinit (void ) { -struct snd_soc_device *socdev =platform_get_drvdata (pdev); -struct wm8750_setup_data *setup = socdev->codec_data; -struct snd_soc_codec *codec; -struct wm8750_priv *wm8750;int ret; - - codec =kzalloc (sizeof (struct snd_soc_codec ),GFP_KERNEL ); -if (codec ==NULL ) -return -ENOMEM ; - - wm8750 =kzalloc (sizeof (struct wm8750_priv ),GFP_KERNEL ); -if (wm8750 ==NULL ) { -kfree (codec); -return -ENOMEM ; - } - - codec->private_data = wm8750; - socdev->card->codec = codec; -mutex_init (&codec->mutex); -INIT_LIST_HEAD (&codec->dapm_widgets); -INIT_LIST_HEAD (&codec->dapm_paths); - wm8750_socdev = socdev; - - ret = -ENODEV ; -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE ) -if (setup->i2c_address) { - ret =wm8750_add_i2c_device (pdev, setup); - } + ret =i2c_add_driver (&wm8750_i2c_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8750 I2C driver: %d\n" , ret);#endif #if defined(CONFIG_SPI_MASTER ) -if (setup->spi) { - ret =spi_register_driver (&wm8750_spi_driver); -if (ret !=0 ) -printk (KERN_ERR "can't add spi driver" ); - } + ret =spi_register_driver (&wm8750_spi_driver); +if (ret !=0 ) +pr_err ("Failed to register WM8750 SPI driver: %d\n" , ret);#endif - -if (ret !=0 ) { -kfree (codec->private_data); -kfree (codec); - } -return ret; +return 0 ; } +module_init (wm8750_modinit); -/* power down chip */ -static int wm8750_remove (struct platform_device *pdev) +static void __exit wm8750_exit(void) { -struct snd_soc_device *socdev =platform_get_drvdata (pdev); -struct snd_soc_codec *codec = socdev->card->codec; - -if (codec->control_data) -wm8750_set_bias_level (codec,SND_SOC_BIAS_OFF ); -snd_soc_free_pcms (socdev); -snd_soc_dapm_free (socdev);#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE ) -i2c_unregister_device (codec->control_data);i2c_del_driver (&wm8750_i2c_driver);#endif #if defined(CONFIG_SPI_MASTER )spi_unregister_driver (&wm8750_spi_driver);#endif -kfree (codec->private_data); -kfree (codec); - -return 0 ; -} - -struct snd_soc_codec_device soc_codec_dev_wm8750 = { - .probe = wm8750_probe, - .remove = wm8750_remove, - .suspend = wm8750_suspend, - .resume = wm8750_resume, -}; -EXPORT_SYMBOL_GPL (soc_codec_dev_wm8750); - -static int __init wm8750_modinit (void ) -{ -return snd_soc_register_dai (&wm8750_dai); -} -module_init (wm8750_modinit); - -static void __exit wm8750_exit(void) -{ -snd_soc_unregister_dai (&wm8750_dai); }module_exit (wm8750_exit);
Signature · 1 line
1.7.0
Quoted 7 lines · Marek Vasut
Register the WM8750 as a SPI or I2C device. This patch mostly shuffles code around. Hugely inspired by WM8753 which was already converted.
Signed-off-by Marek Vasut <[email protected]>--- sound/soc/codecs/wm8750.c | 297 +++++++++++++++++++++------------------------ 1 files changed, 140 insertions(+), 157 deletions(-)
Signature · 3 lines
Freelance Developer, SlimLogic Ltd ASoC and Voltage Regulator Maintainer. http://www.slimlogic.co.uk
Quoted 4 lines · Marek Vasut
Register the WM8750 as a SPI or I2C device. This patch mostly shuffles code around. Hugely inspired by WM8753 which was already converted.
Signed-off-by Marek Vasut <[email protected]>
This all looks good but we need the machine driver updates pulling out the registration too. Like I say, wm8731 had the same problem.
The use of snd_soc_register_dais() with just one DAI is a bit odd but not a problem.
Dne Po 29. března 2010 14:48:09 Mark Brown napsal(a):
Quoted 12 lines · Marek Vasut
Quoted 4 lines
Register the WM8750 as a SPI or I2C device. This patch mostly shuffles code around. Hugely inspired by WM8753 which was already converted.
Signed-off-by Marek Vasut <[email protected]>This all looks good but we need the machine driver updates pulling out the registration too. Like I say, wm8731 had the same problem.
The use of
snd_soc_register_dais()with just one DAI is a bit odd but not a problem.
ok, shall I send that in another patch and CC linux-arm ?
_______________________________________________
Alsa-devel mailing list [email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
Quoted 1 line · Marek Vasut
ok, shall I send that in another patch and CC linux-arm ?
It should be merged into the same patch but yes, or to mitigate against merge issues you could do the registration in the ASoC machine drivers then merge to arch/arm in a second round later.
Dne Út 30. března 2010 11:40:43 Mark Brown napsal(a):
Quoted 7 lines · Marek Vasut
Quoted 1 line
ok, shall I send that in another patch and CC linux-arm ?
It should be merged into the same patch but yes, or to mitigate against merge issues you could do the registration in the ASoC machine drivers then merge to
arch/armin a second round later.
I'll send two patches and we can push them both through alsa. I doubt anyone will have problems with the arm stuff, those are not too used platform. As for the Z, I know the people who work on it so it should be fine.
Could you push this patch? I'll supply the rest tonight.
Cheers
_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel