ASoC: Remove unused -codec from Wolfson device driver names
Subsystems (3)
PATCH 1/21 ASoC: Remove unused -codec from Wolfson device driver names
Devices that aren't MFDs don't need to distinguish this.
--- sound/soc/codecs/wm8510.c | 2 +- sound/soc/codecs/wm8727.c | 2 +- sound/soc/codecs/wm8900.c | 4 ++-- sound/soc/codecs/wm8904.c | 2 +- sound/soc/codecs/wm8940.c | 2 +- sound/soc/codecs/wm8955.c | 2 +- sound/soc/codecs/wm8960.c | 2 +- sound/soc/codecs/wm8961.c | 2 +- sound/soc/codecs/wm8971.c | 2 +- sound/soc/codecs/wm8974.c | 2 +- sound/soc/codecs/wm8988.c | 2 +- sound/soc/codecs/wm8990.c | 2 +- sound/soc/codecs/wm8993.c | 2 +- sound/soc/codecs/wm9090.c | 2 +- 14 files changed, 15 insertions(+), 15 deletions(-)
sound/soc/codecs/wm8510.c +1 -1
@@ -666,7 +666,7 @@ MODULE_DEVICE_TABLE(i2c, wm8510_i2c_id);static struct i2c_driver wm8510_i2c_driver = { .driver = { - .name ="wm8510-codec" , + .name ="wm8510" , .owner =THIS_MODULE , .of_match_table = wm8510_of_match, },
sound/soc/codecs/wm8727.c +1 -1
@@ -59,7 +59,7 @@ static int __devexit wm8727_remove(struct platform_device *pdev)static struct platform_driver wm8727_codec_driver = { .driver = { - .name ="wm8727-codec" , + .name ="wm8727" , .owner =THIS_MODULE , },
sound/soc/codecs/wm8900.c +2 -2
@@ -1258,7 +1258,7 @@ static int __devexit wm8900_spi_remove(struct spi_device *spi)static struct spi_driver wm8900_spi_driver = { .driver = { - .name ="wm8900-codec" , + .name ="wm8900" , .owner =THIS_MODULE , }, .probe = wm8900_spi_probe,
@@ -1302,7 +1302,7 @@ MODULE_DEVICE_TABLE(i2c, wm8900_i2c_id);static struct i2c_driver wm8900_i2c_driver = { .driver = { - .name ="wm8900-codec" , + .name ="wm8900" , .owner =THIS_MODULE , }, .probe = wm8900_i2c_probe,
sound/soc/codecs/wm8904.c +1 -1
@@ -2564,7 +2564,7 @@ MODULE_DEVICE_TABLE(i2c, wm8904_i2c_id);static struct i2c_driver wm8904_i2c_driver = { .driver = { - .name ="wm8904-codec" , + .name ="wm8904" , .owner =THIS_MODULE , }, .probe = wm8904_i2c_probe,
sound/soc/codecs/wm8940.c +1 -1
@@ -779,7 +779,7 @@ MODULE_DEVICE_TABLE(i2c, wm8940_i2c_id);static struct i2c_driver wm8940_i2c_driver = { .driver = { - .name ="wm8940-codec" , + .name ="wm8940" , .owner =THIS_MODULE , }, .probe = wm8940_i2c_probe,
sound/soc/codecs/wm8955.c +1 -1
@@ -1037,7 +1037,7 @@ MODULE_DEVICE_TABLE(i2c, wm8955_i2c_id);static struct i2c_driver wm8955_i2c_driver = { .driver = { - .name ="wm8955-codec" , + .name ="wm8955" , .owner =THIS_MODULE , }, .probe = wm8955_i2c_probe,
sound/soc/codecs/wm8960.c +1 -1
@@ -1030,7 +1030,7 @@ MODULE_DEVICE_TABLE(i2c, wm8960_i2c_id);static struct i2c_driver wm8960_i2c_driver = { .driver = { - .name ="wm8960-codec" , + .name ="wm8960" , .owner =THIS_MODULE , }, .probe = wm8960_i2c_probe,
sound/soc/codecs/wm8961.c +1 -1
@@ -1116,7 +1116,7 @@ MODULE_DEVICE_TABLE(i2c, wm8961_i2c_id);static struct i2c_driver wm8961_i2c_driver = { .driver = { - .name ="wm8961-codec" , + .name ="wm8961" , .owner =THIS_MODULE , }, .probe = wm8961_i2c_probe,
sound/soc/codecs/wm8971.c +1 -1
@@ -724,7 +724,7 @@ MODULE_DEVICE_TABLE(i2c, wm8971_i2c_id);static struct i2c_driver wm8971_i2c_driver = { .driver = { - .name ="wm8971-codec" , + .name ="wm8971" , .owner =THIS_MODULE , }, .probe = wm8971_i2c_probe,
sound/soc/codecs/wm8974.c +1 -1
@@ -671,7 +671,7 @@ MODULE_DEVICE_TABLE(i2c, wm8974_i2c_id);static struct i2c_driver wm8974_i2c_driver = { .driver = { - .name ="wm8974-codec" , + .name ="wm8974" , .owner =THIS_MODULE , }, .probe = wm8974_i2c_probe,
sound/soc/codecs/wm8988.c +1 -1
@@ -822,7 +822,7 @@ static int __devexit wm8988_spi_remove(struct spi_device *spi)static struct spi_driver wm8988_spi_driver = { .driver = { - .name ="wm8988-codec" , + .name ="wm8988" , .owner =THIS_MODULE , }, .probe = wm8988_spi_probe,
sound/soc/codecs/wm8990.c +1 -1
@@ -1417,7 +1417,7 @@ MODULE_DEVICE_TABLE(i2c, wm8990_i2c_id);static struct i2c_driver wm8990_i2c_driver = { .driver = { - .name ="wm8990-codec" , + .name ="wm8990" , .owner =THIS_MODULE , }, .probe = wm8990_i2c_probe,
sound/soc/codecs/wm8993.c +1 -1
@@ -1641,7 +1641,7 @@ MODULE_DEVICE_TABLE(i2c, wm8993_i2c_id);static struct i2c_driver wm8993_i2c_driver = { .driver = { - .name ="wm8993-codec" , + .name ="wm8993" , .owner =THIS_MODULE , }, .probe = wm8993_i2c_probe,
sound/soc/codecs/wm9090.c +1 -1
@@ -685,7 +685,7 @@ MODULE_DEVICE_TABLE(i2c, wm9090_id);static struct i2c_driver wm9090_i2c_driver = { .driver = { - .name ="wm9090-codec" , + .name ="wm9090" , .owner =THIS_MODULE , }, .probe = wm9090_i2c_probe,
Signature · 1 line
1.7.7.3
PATCH 2/21 ASoC: Remove I2C ifdefs from WM8960
The driver only supports I2C as the control interface.
--- sound/soc/codecs/wm8960.c | 6 ------ 1 files changed, 0 insertions(+), 6 deletions(-)
sound/soc/codecs/wm8960.c +0 -6
@@ -994,7 +994,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8960 = { .reg_cache_default = wm8960_reg, }; -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )static __devinit int wm8960_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id) {
@@ -1037,27 +1036,22 @@ static struct i2c_driver wm8960_i2c_driver = { .remove = __devexit_p(wm8960_i2c_remove), .id_table = wm8960_i2c_id, }; -#endif static int __init wm8960_modinit (void ) {int ret =0 ; -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE ) ret =i2c_add_driver (&wm8960_i2c_driver);if (ret !=0 ) {printk (KERN_ERR "Failed to register WM8960 I2C driver: %d\n" , ret); } -#endif return ret; }module_init (wm8960_modinit); static void __exit wm8960_exit(void) { -#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )i2c_del_driver (&wm8960_i2c_driver); -#endif }module_exit (wm8960_exit);
Signature · 1 line
1.7.7.3
PATCH 3/21 ASoC: Remove unused AUDIO_NAME define from WM8960
In reply to Mark Brown--- sound/soc/codecs/wm8960.c | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-)
sound/soc/codecs/wm8960.c +0 -2
@@ -25,8 +25,6 @@#include "wm8960.h" -#define AUDIO_NAME "wm8960" -/* R25 - Power 1 */ #define WM8960_VMID_MASK 0x180#define WM8960_VREF 0x40
Signature · 1 line
1.7.7.3
PATCH 4/21 ASoC: Convert WM2000 to devm_kzalloc()
In reply to Mark Brown--- sound/soc/codecs/wm2000.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/wm2000.c +5 -5
@@ -740,7 +740,8 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,return -EINVAL ; } - wm2000 =kzalloc (sizeof (struct wm2000_priv ),GFP_KERNEL ); + wm2000 =devm_kzalloc (&i2c->dev,sizeof (struct wm2000_priv ), +GFP_KERNEL );if (wm2000 ==NULL ) {dev_err (&i2c->dev,"Unable to allocate private data\n" );return -ENOMEM ;
@@ -779,7 +780,9 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,/* Pre-cook the concatenation of the register address onto the image */ wm2000->anc_download_size = fw->size +2 ; - wm2000->anc_download =kmalloc (wm2000->anc_download_size,GFP_KERNEL ); + wm2000->anc_download =devm_kzalloc (&i2c->dev, + wm2000->anc_download_size, +GFP_KERNEL );if (wm2000->anc_download ==NULL ) {dev_err (&i2c->dev,"Out of memory\n" ); ret = -ENOMEM ;
@@ -810,7 +813,6 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, err_fw:release_firmware (fw); err: -kfree (wm2000);return ret; }
@@ -821,8 +823,6 @@ static __devexit int wm2000_i2c_remove(struct i2c_client *i2c)wm2000_anc_transition (wm2000,ANC_OFF ); wm2000_i2c =NULL ; -kfree (wm2000->anc_download); -kfree (wm2000);return 0 ; }
Signature · 1 line
1.7.7.3
PATCH 5/21 ASoC: Convert WM8350 to devm_kzalloc()
In reply to Mark Brown--- sound/soc/codecs/wm8350.c | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-)
sound/soc/codecs/wm8350.c +4 -7
@@ -1553,7 +1553,8 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)return -EINVAL ; } - priv =kzalloc (sizeof (struct wm8350_data ),GFP_KERNEL ); + priv =devm_kzalloc (codec->dev,sizeof (struct wm8350_data ), +GFP_KERNEL );if (priv ==NULL )return -ENOMEM ;snd_soc_codec_set_drvdata (codec, priv);
@@ -1564,7 +1565,7 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) ret =regulator_bulk_get (wm8350->dev,ARRAY_SIZE (priv->supplies), priv->supplies);if (ret !=0 ) - goto err_priv; +return ret; wm8350->codec.codec = codec; codec->control_data = wm8350;
@@ -1640,10 +1641,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec)wm8350_set_bias_level (codec,SND_SOC_BIAS_STANDBY );return 0 ; - -err_priv: -kfree (priv); -return ret; }static int wm8350_codec_remove (struct snd_soc_codec *codec)
@@ -1676,7 +1673,7 @@ static int wm8350_codec_remove(struct snd_soc_codec *codec)wm8350_clear_bits (wm8350,WM8350_POWER_MGMT_5 ,WM8350_CODEC_ENA );regulator_bulk_free (ARRAY_SIZE (priv->supplies), priv->supplies); -kfree (priv); +return 0 ; }
Signature · 1 line
1.7.7.3
PATCH 6/21 ASoC: Convert WM8400 to devm_kzalloc()
In reply to Mark Brown--- sound/soc/codecs/wm8400.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-)
sound/soc/codecs/wm8400.c +3 -6
@@ -1383,7 +1383,8 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec)int ret;u16 reg; - priv =kzalloc (sizeof (struct wm8400_priv ),GFP_KERNEL ); + priv =devm_kzalloc (codec->dev,sizeof (struct wm8400_priv ), +GFP_KERNEL );if (priv ==NULL )return -ENOMEM ;
@@ -1395,7 +1396,7 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) ARRAY_SIZE(power), &power[0]);if (ret !=0 ) {dev_err (codec->dev,"Failed to get regulators: %d\n" , ret); - goto err; +return ret; }INIT_WORK (&priv->work, wm8400_probe_deferred);
@@ -1426,14 +1427,11 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) err_regulator:regulator_bulk_free (ARRAY_SIZE (power), power); -err: -kfree (priv);return ret; }static int wm8400_codec_remove (struct snd_soc_codec *codec) { -struct wm8400_priv *priv =snd_soc_codec_get_drvdata (codec);u16 reg; reg =wm8400_read (codec,WM8400_POWER_MANAGEMENT_1 );
@@ -1441,7 +1439,6 @@ static int wm8400_codec_remove(struct snd_soc_codec *codec) reg & (~WM8400_CODEC_ENA));regulator_bulk_free (ARRAY_SIZE (power), power); -kfree (priv);return 0 ; }
Signature · 1 line
1.7.7.3
PATCH 7/21 ASoC: Convert WM8741 to devm_kzalloc()
In reply to Mark Brown--- sound/soc/codecs/wm8741.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-)
sound/soc/codecs/wm8741.c +4 -12
@@ -503,7 +503,8 @@ static int wm8741_i2c_probe(struct i2c_client *i2c,struct wm8741_priv *wm8741;int ret; - wm8741 =kzalloc (sizeof (struct wm8741_priv ),GFP_KERNEL ); + wm8741 =devm_kzalloc (&i2c->dev,sizeof (struct wm8741_priv ), +GFP_KERNEL );if (wm8741 ==NULL )return -ENOMEM ;
@@ -512,20 +513,13 @@ static int wm8741_i2c_probe(struct i2c_client *i2c, ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm8741, &wm8741_dai,1 ); -if (ret !=0 ) - goto err;return ret; - -err: -kfree (wm8741); -return ret; }static int wm8741_i2c_remove (struct i2c_client *client) {snd_soc_unregister_codec (&client->dev); -kfree (i2c_get_clientdata (client));return 0 ; }
@@ -553,7 +547,8 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi)struct wm8741_priv *wm8741;int ret; - wm8741 =kzalloc (sizeof (struct wm8741_priv ),GFP_KERNEL ); + wm8741 =devm_kzalloc (&spi->dev,sizeof (struct wm8741_priv ), +GFP_KERNEL );if (wm8741 ==NULL )return -ENOMEM ;
@@ -562,15 +557,12 @@ static int __devinit wm8741_spi_probe(struct spi_device *spi) ret =snd_soc_register_codec (&spi->dev, &soc_codec_dev_wm8741, &wm8741_dai,1 ); -if (ret <0 ) -kfree (wm8741);return ret; } static int __devexit wm8741_spi_remove(struct spi_device *spi) {snd_soc_unregister_codec (&spi->dev); -kfree (spi_get_drvdata (spi));return 0 ; }
Signature · 1 line
1.7.7.3
Re: [PATCH 07/21] ASoC: Convert WM8741 to devm_kzalloc()
Quoted 9 lines · Mark Brown
Signed-off-by Mark Brown <[email protected]>--- sound/soc/codecs/wm8741.c | 16 ++++------------ 1 files changed, 4 insertions(+), 12 deletions(-)sound/soc/codecs/wm8741.c +0
-0
[...]
sound/soc/codecs/wm8741.c static int wm8741_i2c_probe(struct i2c_client *i2c, · line 518
Quoted 13 lines
sound/soc/codecs/wm8741.c +0
-6@@ -512,20 +513,13 @@ static int wm8741_i2c_probe(struct i2c_client *i2c, ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm8741, &wm8741_dai,1 ); -if (ret !=0 ) - goto err;return ret; - -err: -kfree (wm8741); -return ret; }
Any particular reason why this is not collapsed into:
return snd_soc_register_codec(...)
The same goes for patches 8 and 9.
Thierry
Re: [PATCH 07/21] ASoC: Convert WM8741 to devm_kzalloc()
Quoted 5 lines · Thierry Reding
Any particular reason why this is not collapsed into:
return
snd_soc_register_codec(...)The same goes for patches 8 and 9.
It's more effort than a fairly mechanical change and we'll want to add the more structured code back very soon anyway as we push more of the init into the I2C and SPI inits.
PATCH 8/21 ASoC: Convert WM8750 to devm_kzalloc()
In reply to Mark Brown--- sound/soc/codecs/wm8750.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-)
sound/soc/codecs/wm8750.c +4 -8
@@ -744,7 +744,8 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi)struct wm8750_priv *wm8750;int ret; - wm8750 =kzalloc (sizeof (struct wm8750_priv ),GFP_KERNEL ); + wm8750 =devm_kzalloc (&spi->dev,sizeof (struct wm8750_priv ), +GFP_KERNEL );if (wm8750 ==NULL )return -ENOMEM ;
@@ -753,15 +754,12 @@ static int __devinit wm8750_spi_probe(struct spi_device *spi) ret =snd_soc_register_codec (&spi->dev, &soc_codec_dev_wm8750, &wm8750_dai,1 ); -if (ret <0 ) -kfree (wm8750);return ret; } static int __devexit wm8750_spi_remove(struct spi_device *spi) {snd_soc_unregister_codec (&spi->dev); -kfree (spi_get_drvdata (spi));return 0 ; }
@@ -791,7 +789,8 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c,struct wm8750_priv *wm8750;int ret; - wm8750 =kzalloc (sizeof (struct wm8750_priv ),GFP_KERNEL ); + wm8750 =devm_kzalloc (&i2c->dev,sizeof (struct wm8750_priv ), +GFP_KERNEL );if (wm8750 ==NULL )return -ENOMEM ;
@@ -800,15 +799,12 @@ static __devinit int wm8750_i2c_probe(struct i2c_client *i2c, ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm8750, &wm8750_dai,1 ); -if (ret <0 ) -kfree (wm8750);return ret; } static __devexit int wm8750_i2c_remove(struct i2c_client *client) {snd_soc_unregister_codec (&client->dev); -kfree (i2c_get_clientdata (client));return 0 ; }
Signature · 1 line
1.7.7.3
PATCH 9/21 ASoC: Convert WM9090 to devm_kzalloc()
In reply to Mark Brown--- sound/soc/codecs/wm9090.c | 5 +---- 1 files changed, 1 insertions(+), 4 deletions(-)
sound/soc/codecs/wm9090.c +1 -4
@@ -647,7 +647,7 @@ static int wm9090_i2c_probe(struct i2c_client *i2c,struct wm9090_priv *wm9090;int ret; - wm9090 =kzalloc (sizeof (*wm9090),GFP_KERNEL ); + wm9090 =devm_kzalloc (&i2c->dev,sizeof (*wm9090),GFP_KERNEL );if (wm9090 ==NULL ) {dev_err (&i2c->dev,"Can not allocate memory\n" );return -ENOMEM ;
@@ -661,8 +661,6 @@ static int wm9090_i2c_probe(struct i2c_client *i2c, ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm9090,NULL ,0 ); -if (ret <0 ) -kfree (wm9090);return ret; }
@@ -671,7 +669,6 @@ static int __devexit wm9090_i2c_remove(struct i2c_client *i2c)struct wm9090_priv *wm9090 =i2c_get_clientdata (i2c);snd_soc_unregister_codec (&i2c->dev); -kfree (wm9090);return 0 ; }
Signature · 1 line
1.7.7.3
PATCH 10/21 ASoC: Convert WM8350 to table based DAPM and control init
In reply to Mark Brown--- sound/soc/codecs/wm8350.c | 36 ++++++++---------------------------- 1 files changed, 8 insertions(+), 28 deletions(-)
sound/soc/codecs/wm8350.c +8 -28
@@ -696,7 +696,7 @@ static const struct snd_soc_dapm_widget wm8350_dapm_widgets[] = { SND_SOC_DAPM_INPUT("IN3L"), }; -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route wm8350_dapm_routes[] = {/* left playback mixer */ {"Left Playback Mixer" ,"Playback Switch" ,"Left DAC" },
@@ -777,29 +777,6 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Beep", NULL, "IN3R PGA"}, }; -static int wm8350_add_widgets (struct snd_soc_codec *codec) -{ -struct snd_soc_dapm_context *dapm = &codec->dapm; -int ret; - - ret =snd_soc_dapm_new_controls (dapm, - wm8350_dapm_widgets, -ARRAY_SIZE (wm8350_dapm_widgets)); -if (ret !=0 ) { -dev_err (codec->dev,"dapm control register failed\n" ); -return ret; - } - -/* set up audio paths */ - ret =snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); -if (ret !=0 ) { -dev_err (codec->dev,"DAPM route register failed\n" ); -return ret; - } - -return 0 ; -} -static int wm8350_set_dai_sysclk (struct snd_soc_dai *codec_dai,int clk_id,unsigned int freq,int dir) {
@@ -1634,10 +1611,6 @@ static int wm8350_codec_probe(struct snd_soc_codec *codec) wm8350_mic_handler, 0, "Microphone detect", priv); -snd_soc_add_controls (codec, wm8350_snd_controls, -ARRAY_SIZE (wm8350_snd_controls)); -wm8350_add_widgets (codec); -wm8350_set_bias_level (codec,SND_SOC_BIAS_STANDBY );return 0 ;
@@ -1685,6 +1658,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8350 = { .read = wm8350_codec_read, .write = wm8350_codec_write, .set_bias_level = wm8350_set_bias_level, + + .controls = wm8350_snd_controls, + .num_controls = ARRAY_SIZE(wm8350_snd_controls), + .dapm_widgets = wm8350_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8350_dapm_widgets), + .dapm_routes = wm8350_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8350_dapm_routes), };static int __devinit wm8350_probe (struct platform_device *pdev)
Signature · 1 line
1.7.7.3
PATCH 11/21 ASoC: Convert WM8400 to table based DAPM and control init
In reply to Mark Brown--- sound/soc/codecs/wm8400.c | 29 ++++++++--------------------- 1 files changed, 8 insertions(+), 21 deletions(-)
sound/soc/codecs/wm8400.c +8 -21
@@ -353,13 +353,6 @@ SOC_SINGLE("RIN34 Mute Switch", WM8400_RIGHT_LINE_INPUT_3_4_VOLUME, }; -/* add non dapm controls */ -static int wm8400_add_controls (struct snd_soc_codec *codec) -{ -return snd_soc_add_controls (codec, wm8400_snd_controls, -ARRAY_SIZE (wm8400_snd_controls)); -} -/* * _DAPM_ Controls */
@@ -783,7 +776,7 @@ SND_SOC_DAPM_OUTPUT("RON"), SND_SOC_DAPM_OUTPUT("Internal DAC Sink"), }; -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route wm8400_dapm_routes[] = {/* Make DACs turn on when playing even if not mixed into any outputs */ {"Internal DAC Sink" ,NULL ,"Left DAC" }, {"Internal DAC Sink" ,NULL ,"Right DAC" },
@@ -909,17 +902,6 @@ static const struct snd_soc_dapm_route audio_map[] = { {"RON", NULL, "RONMIX"}, }; -static int wm8400_add_widgets (struct snd_soc_codec *codec) -{ -struct snd_soc_dapm_context *dapm = &codec->dapm; - -snd_soc_dapm_new_controls (dapm, wm8400_dapm_widgets, -ARRAY_SIZE (wm8400_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); - -return 0 ; -} -/* * Clock after FLL and dividers */
@@ -1421,8 +1403,6 @@ static int wm8400_codec_probe(struct snd_soc_codec *codec) ret = -EINVAL ; goto err_regulator; } -wm8400_add_controls (codec); -wm8400_add_widgets (codec);return 0 ; err_regulator:
@@ -1451,6 +1431,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8400 = { .read = wm8400_read, .write = wm8400_write, .set_bias_level = wm8400_set_bias_level, + + .controls = wm8400_snd_controls, + .num_controls = ARRAY_SIZE(wm8400_snd_controls), + .dapm_widgets = wm8400_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8400_dapm_widgets), + .dapm_routes = wm8400_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8400_dapm_routes), };static int __devinit wm8400_probe (struct platform_device *pdev)
Signature · 1 line
1.7.7.3
PATCH 12/21 ASoC: Convert WM8510 to table based DAPM and control init
In reply to Mark Brown--- sound/soc/codecs/wm8510.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-)
sound/soc/codecs/wm8510.c +8 -15
@@ -181,7 +181,7 @@ SND_SOC_DAPM_OUTPUT("SPKOUTP"), SND_SOC_DAPM_OUTPUT("SPKOUTN"), }; -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route wm8510_dapm_routes[] = {/* Mono output mixer */ {"Mono Mixer" ,"PCM Playback Switch" ,"DAC" }, {"Mono Mixer" ,"Aux Playback Switch" ,"Aux Input" },
@@ -213,17 +213,6 @@ static const struct snd_soc_dapm_route audio_map[] = { {"ADC", NULL, "Boost Mixer"}, }; -static int wm8510_add_widgets(struct snd_soc_codec *codec) -{ - struct snd_soc_dapm_context *dapm = &codec->dapm; - - snd_soc_dapm_new_controls(dapm, wm8510_dapm_widgets, - ARRAY_SIZE(wm8510_dapm_widgets)); - snd_soc_dapm_add_routes(dapm, audio_map, ARRAY_SIZE(audio_map)); - - return 0; -} - struct pll_ { unsigned int pre_div:4; /* prescale - 1 */ unsigned int n:4;
@@ -561,9 +550,6 @@ static int wm8510_probe(struct snd_soc_codec *codec)/* power on device */ wm8510_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); -snd_soc_add_controls (codec, wm8510_snd_controls, -ARRAY_SIZE (wm8510_snd_controls)); -wm8510_add_widgets (codec);return ret; }
@@ -587,6 +573,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8510 = { .reg_cache_size = ARRAY_SIZE(wm8510_reg), .reg_word_size = sizeof(u16), .reg_cache_default =wm8510_reg, + + .controls = wm8510_snd_controls, + .num_controls = ARRAY_SIZE(wm8510_snd_controls), + .dapm_widgets = wm8510_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8510_dapm_widgets), + .dapm_routes = wm8510_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8510_dapm_routes), };static const struct of_device_id wm8510_of_match[] = {
Signature · 1 line
1.7.7.3
PATCH 13/21 ASoC: Convert WM8580 to table based DAPM and control init
In reply to Mark Brown--- sound/soc/codecs/wm8580.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-)
sound/soc/codecs/wm8580.c +8 -16
@@ -272,7 +272,7 @@ SND_SOC_DAPM_INPUT("AINL"), SND_SOC_DAPM_INPUT("AINR"), }; -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route wm8580_dapm_routes[] = { {"VOUT1L" ,NULL ,"DAC1" }, {"VOUT1R" ,NULL ,"DAC1" },
@@ -286,17 +286,6 @@ static const struct snd_soc_dapm_route audio_map[] = { { "ADC", NULL, "AINR" }, }; -static int wm8580_add_widgets (struct snd_soc_codec *codec) -{ -struct snd_soc_dapm_context *dapm = &codec->dapm; - -snd_soc_dapm_new_controls (dapm, wm8580_dapm_widgets, -ARRAY_SIZE (wm8580_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); - -return 0 ; -} -/* PLL divisors */ struct _pll_div { u32 prescale:1;
@@ -856,10 +845,6 @@ static int wm8580_probe(struct snd_soc_codec *codec)wm8580_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); -snd_soc_add_controls (codec, wm8580_snd_controls, -ARRAY_SIZE (wm8580_snd_controls)); -wm8580_add_widgets (codec); -return 0 ; err_regulator_enable:
@@ -889,6 +874,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8580 = { .reg_cache_size = ARRAY_SIZE(wm8580_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8580_reg, + + .controls = wm8580_snd_controls, + .num_controls = ARRAY_SIZE(wm8580_snd_controls), + .dapm_widgets = wm8580_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8580_dapm_widgets), + .dapm_routes = wm8580_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8580_dapm_routes), };static const struct of_device_id wm8580_of_match[] = {
Signature · 1 line
1.7.7.3
PATCH 14/21 ASoC: Convert WM8741 to table based DAPM and control init
In reply to Mark Brown--- sound/soc/codecs/wm8741.c | 24 ++++++++---------------- 1 files changed, 8 insertions(+), 16 deletions(-)
sound/soc/codecs/wm8741.c +8 -16
@@ -85,24 +85,13 @@ SND_SOC_DAPM_OUTPUT("VOUTRP"), SND_SOC_DAPM_OUTPUT("VOUTRN"), }; -static const struct snd_soc_dapm_route intercon[] = { +static const struct snd_soc_dapm_route wm8741_dapm_routes[] = { {"VOUTLP" ,NULL ,"DACL" }, {"VOUTLN" ,NULL ,"DACL" }, {"VOUTRP" ,NULL ,"DACR" }, {"VOUTRN" ,NULL ,"DACR" }, }; -static int wm8741_add_widgets (struct snd_soc_codec *codec) -{ -struct snd_soc_dapm_context *dapm = &codec->dapm; - -snd_soc_dapm_new_controls (dapm, wm8741_dapm_widgets, -ARRAY_SIZE (wm8741_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, intercon,ARRAY_SIZE (intercon)); - -return 0 ; -} - static struct { int value; int ratio;
@@ -456,10 +445,6 @@ static int wm8741_probe(struct snd_soc_codec *codec)snd_soc_update_bits (codec,WM8741_DACRMSB_ATTENUATION ,WM8741_UPDATERM ,WM8741_UPDATERM ); -snd_soc_add_controls (codec, wm8741_snd_controls, -ARRAY_SIZE (wm8741_snd_controls)); -wm8741_add_widgets (codec); -dev_dbg (codec->dev,"Successful registration\n" );return ret;
@@ -488,6 +473,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8741 = { .reg_cache_size = ARRAY_SIZE(wm8741_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8741_reg_defaults, + + .controls = wm8741_snd_controls, + .num_controls = ARRAY_SIZE(wm8741_snd_controls), + .dapm_widgets = wm8741_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8741_dapm_widgets), + .dapm_routes = wm8741_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8741_dapm_routes), };static const struct of_device_id wm8741_of_match[] = {
Signature · 1 line
1.7.7.3
PATCH 15/21 ASoC: Convert WM8750 to table based DAPM and control init
In reply to Mark Brown--- sound/soc/codecs/wm8750.c | 23 ++++++++--------------- 1 files changed, 8 insertions(+), 15 deletions(-)
sound/soc/codecs/wm8750.c +8 -15
@@ -301,7 +301,7 @@ static const struct snd_soc_dapm_widget wm8750_dapm_widgets[] = { SND_SOC_DAPM_INPUT("RINPUT3"), }; -static const struct snd_soc_dapm_route audio_map[] = { +static const struct snd_soc_dapm_route wm8750_dapm_routes[] = {/* left mixer */ {"Left Mixer" ,"Playback Switch" ,"Left DAC" }, {"Left Mixer" ,"Left Bypass Switch" ,"Left Line Mux" },
@@ -395,17 +395,6 @@ static const struct snd_soc_dapm_route audio_map[] = { {"Right ADC", NULL, "Right ADC Mux"}, }; -static int wm8750_add_widgets (struct snd_soc_codec *codec) -{ -struct snd_soc_dapm_context *dapm = &codec->dapm; - -snd_soc_dapm_new_controls (dapm, wm8750_dapm_widgets, -ARRAY_SIZE (wm8750_dapm_widgets)); -snd_soc_dapm_add_routes (dapm, audio_map,ARRAY_SIZE (audio_map)); - -return 0 ; -} - struct _coeff_div { u32 mclk; u32 rate;
@@ -708,9 +697,6 @@ static int wm8750_probe(struct snd_soc_codec *codec)snd_soc_update_bits (codec,WM8750_LINVOL ,0x0100 ,0x0100 );snd_soc_update_bits (codec,WM8750_RINVOL ,0x0100 ,0x0100 ); -snd_soc_add_controls (codec, wm8750_snd_controls, -ARRAY_SIZE (wm8750_snd_controls)); -wm8750_add_widgets (codec);return ret; }
@@ -729,6 +715,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8750 = { .reg_cache_size = ARRAY_SIZE(wm8750_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8750_reg, + + .controls = wm8750_snd_controls, + .num_controls = ARRAY_SIZE(wm8750_snd_controls), + .dapm_widgets = wm8750_dapm_widgets, + .num_dapm_widgets = ARRAY_SIZE(wm8750_dapm_widgets), + .dapm_routes = wm8750_dapm_routes, + .num_dapm_routes = ARRAY_SIZE(wm8750_dapm_routes), };static const struct of_device_id wm8750_of_match[] = {
Signature · 1 line
1.7.7.3
PATCH 16/21 ASoC: Convert WM8711 to table based control init
In reply to Mark Brown--- sound/soc/codecs/wm8711.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8711.c +2 -3
@@ -374,9 +374,6 @@ static int wm8711_probe(struct snd_soc_codec *codec)snd_soc_update_bits (codec,WM8711_LOUT1V ,0x0100 ,0x0100 );snd_soc_update_bits (codec,WM8711_ROUT1V ,0x0100 ,0x0100 ); -snd_soc_add_controls (codec, wm8711_snd_controls, -ARRAY_SIZE (wm8711_snd_controls)); -return ret; }
@@ -397,6 +394,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8711 = { .reg_cache_size = ARRAY_SIZE(wm8711_reg), .reg_word_size = sizeof(u16), .reg_cache_default = wm8711_reg, + .controls = wm8711_snd_controls, + .num_controls = ARRAY_SIZE(wm8711_snd_controls), .dapm_widgets = wm8711_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm8711_dapm_widgets), .dapm_routes = wm8711_intercon,
Signature · 1 line
1.7.7.3
PATCH 17/21 ASoC: Convert WM8728 to table based control init
In reply to Mark Brown--- sound/soc/codecs/wm8728.c | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-)
sound/soc/codecs/wm8728.c +2 -3
@@ -243,9 +243,6 @@ static int wm8728_probe(struct snd_soc_codec *codec)/* power on device */ wm8728_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); -snd_soc_add_controls (codec, wm8728_snd_controls, -ARRAY_SIZE (wm8728_snd_controls)); -return ret; }
@@ -264,6 +261,8 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8728 = { .reg_cache_size = ARRAY_SIZE(wm8728_reg_defaults), .reg_word_size = sizeof(u16), .reg_cache_default = wm8728_reg_defaults, + .controls = wm8728_snd_controls, + .num_controls = ARRAY_SIZE(wm8728_snd_controls), .dapm_widgets = wm8728_dapm_widgets, .num_dapm_widgets = ARRAY_SIZE(wm8728_dapm_widgets), .dapm_routes = wm8728_intercon,
Signature · 1 line
1.7.7.3
PATCH 18/21 ASoC: Remove unused struct wm2000_setup_data
In reply to Mark Brown--- sound/soc/codecs/wm2000.h | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-)
sound/soc/codecs/wm2000.h +0 -5
@@ -9,11 +9,6 @@#ifndef _WM2000_H#define _WM2000_H -struct wm2000_setup_data { -unsigned short i2c_address; -int mclk_div;/* Set to a non-zero value if MCLK_DIV_2 required */ -}; -extern int wm2000_add_controls (struct snd_soc_codec *codec);#define WM2000_REG_SYS_START 0x8000
Signature · 1 line
1.7.7.3
PATCH 19/21 ASoC: Convert wm2000 to use regmap API
In reply to Mark BrownThe driver wasn't even using the ASoC common code.
--- sound/soc/codecs/wm2000.c | 75 ++++++++++++++++++-------------------------- 1 files changed, 31 insertions(+), 44 deletions(-)
sound/soc/codecs/wm2000.c +31 -44
@@ -29,6 +29,7 @@#include <linux/delay.h> #include <linux/pm.h> #include <linux/i2c.h> +#include <linux/regmap.h> #include <linux/debugfs.h> #include <linux/slab.h> #include <sound/core.h>
@@ -51,6 +52,7 @@ enum wm2000_anc_mode {struct wm2000_priv {struct i2c_client *i2c; +struct regmap *regmap;enum wm2000_anc_mode anc_mode;
@@ -70,54 +72,21 @@ static struct i2c_client *wm2000_i2c;static int wm2000_write (struct i2c_client *i2c,unsigned int reg,unsigned int value) { -u8 data[3 ]; -int ret; - - data[0 ] = (reg >>8 ) &0xff ; - data[1 ] = reg &0xff ; - data[2 ] = value &0xff ; - -dev_vdbg (&i2c->dev,"write %x = %x\n" , reg, value); - - ret =i2c_master_send (i2c, data,3 ); -if (ret ==3 ) -return 0 ; -if (ret <0 ) -return ret; -else -return -EIO ; +struct wm2000_priv *wm2000 =i2c_get_clientdata (i2c); +return regmap_write (wm2000->regmap, reg, value); }static unsigned int wm2000_read (struct i2c_client *i2c,unsigned int r) { -struct i2c_msg xfer[2 ]; -u8 reg[2 ]; -u8 data; +struct wm2000_priv *wm2000 =i2c_get_clientdata (i2c); +unsigned int val;int ret; -/* Write register */ - reg[0 ] = (r >>8 ) &0xff ; - reg[1 ] = r &0xff ; - xfer[0 ].addr = i2c->addr; - xfer[0 ].flags =0 ; - xfer[0 ].len =sizeof (reg); - xfer[0 ].buf = ®[0 ]; - -/* Read data */ - xfer[1 ].addr = i2c->addr; - xfer[1 ].flags =I2C_M_RD ; - xfer[1 ].len =1 ; - xfer[1 ].buf = &data; - - ret =i2c_transfer (i2c->adapter, xfer,2 ); -if (ret !=2 ) { -dev_err (&i2c->dev,"i2c_transfer() returned %d\n" , ret); -return 0 ; - } - -dev_vdbg (&i2c->dev,"read %x from %x\n" , data, r); + ret =regmap_read (wm2000->regmap, r, &val); +if (ret <0 ) +return -1 ; -return data; +return val; }static void wm2000_reset (struct wm2000_priv *wm2000)
@@ -725,6 +694,11 @@ int wm2000_add_controls(struct snd_soc_codec *codec) }EXPORT_SYMBOL_GPL (wm2000_add_controls); +static const struct regmap_config wm2000_regmap = { + .reg_bits =8 , + .val_bits =8 , +}; +static int __devinit wm2000_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *i2c_id) {
@@ -747,6 +721,16 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,return -ENOMEM ; } +dev_set_drvdata (&i2c->dev, wm2000); + + wm2000->regmap =regmap_init_i2c (i2c, &wm2000_regmap); +if (IS_ERR (wm2000->regmap)) { + ret =PTR_ERR (wm2000->regmap); +dev_err (&i2c->dev,"Failed to allocate register map: %d\n" , + ret); + goto err; + } +/* Verify that this is a WM2000 */ reg =wm2000_read (i2c,WM2000_REG_ID1 ); id = reg <<8 ;
@@ -756,7 +740,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,if (id !=0x2000 ) {dev_err (&i2c->dev,"Device is not a WM2000 - ID %x\n" , id); ret = -ENODEV ; - goto err; + goto err_regmap; } reg =wm2000_read (i2c,WM2000_REG_REVISON );
@@ -775,7 +759,7 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, ret =request_firmware (&fw, filename, &i2c->dev);if (ret !=0 ) {dev_err (&i2c->dev,"Failed to acquire ANC data: %d\n" , ret); - goto err; + goto err_regmap; }/* Pre-cook the concatenation of the register address onto the image */
@@ -795,7 +779,6 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c,release_firmware (fw); -dev_set_drvdata (&i2c->dev, wm2000); wm2000->anc_eng_ena =1 ; wm2000->anc_active =1 ; wm2000->spk_ena =1 ;
@@ -812,6 +795,8 @@ static int __devinit wm2000_i2c_probe(struct i2c_client *i2c, err_fw:release_firmware (fw); +err_regmap: +regmap_exit (wm2000->regmap); err:return ret; }
@@ -822,6 +807,8 @@ static __devexit int wm2000_i2c_remove(struct i2c_client *i2c)wm2000_anc_transition (wm2000,ANC_OFF ); +regmap_exit (wm2000->regmap); + wm2000_i2c =NULL ;return 0 ;
Signature · 1 line
1.7.7.3
PATCH 20/21 ASoC: Convert WM2000 into a standard CODEC driver
In reply to Mark BrownWe've been able to handle external amps for a while now.
--- sound/soc/codecs/Kconfig | 6 +- sound/soc/codecs/Makefile | 4 +- sound/soc/codecs/wm2000.c | 145 +++++++++++++++++++++------------------------ sound/soc/codecs/wm2000.h | 2 - 4 files changed, 73 insertions(+), 84 deletions(-)
sound/soc/codecs/Kconfig +3 -3
@@ -298,6 +298,9 @@ config SND_SOC_WM0010 config SND_SOC_WM1250_EV1 tristate +config SND_SOC_WM2000 + tristate + config SND_SOC_WM5100 tristate
@@ -434,8 +437,5 @@ config SND_SOC_MAX9877 config SND_SOC_TPA6130A2 tristate -config SND_SOC_WM2000 - tristate - config SND_SOC_WM9090 tristate
sound/soc/codecs/Makefile +2 -2
@@ -51,6 +51,7 @@ snd-soc-uda1380-objs := uda1380.o snd-soc-wl1273-objs := wl1273.o snd-soc-wm0010-objs := wm0010.o snd-soc-wm1250-ev1-objs := wm1250-ev1.o +snd-soc-wm2000-objs := wm2000.o snd-soc-wm5100-objs := wm5100.o wm5100-tables.o snd-soc-wm8350-objs := wm8350.o snd-soc-wm8400-objs := wm8400.o
@@ -99,7 +100,6 @@ snd-soc-wm-hubs-objs := wm_hubs.o # Amp snd-soc-max9877-objs := max9877.o snd-soc-tpa6130a2-objs := tpa6130a2.o -snd-soc-wm2000-objs := wm2000.o snd-soc-wm9090-objs := wm9090.o obj-$(CONFIG_SND_SOC_88PM860X) += snd-soc-88pm860x.o
@@ -155,6 +155,7 @@ obj-$(CONFIG_SND_SOC_UDA1380) += snd-soc-uda1380.o obj-$(CONFIG_SND_SOC_WL1273) += snd-soc-wl1273.o obj-$(CONFIG_SND_SOC_WM0010) += snd-soc-wm0010.o obj-$(CONFIG_SND_SOC_WM1250_EV1) += snd-soc-wm1250-ev1.o +obj-$(CONFIG_SND_SOC_WM2000) += snd-soc-wm2000.o obj-$(CONFIG_SND_SOC_WM5100) += snd-soc-wm5100.o obj-$(CONFIG_SND_SOC_WM8350) += snd-soc-wm8350.o obj-$(CONFIG_SND_SOC_WM8400) += snd-soc-wm8400.o
@@ -203,5 +204,4 @@ obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o # Amp obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o -obj-$(CONFIG_SND_SOC_WM2000) += snd-soc-wm2000.o obj-$(CONFIG_SND_SOC_WM9090) += snd-soc-wm9090.o
sound/soc/codecs/wm2000.c +68 -77
239 lines not on this page · raw message
sound/soc/codecs/wm2000.h +0 -2
@@ -9,8 +9,6 @@#ifndef _WM2000_H#define _WM2000_H -extern int wm2000_add_controls (struct snd_soc_codec *codec); -#define WM2000_REG_SYS_START 0x8000#define WM2000_REG_SPEECH_CLARITY 0x8fef#define WM2000_REG_SYS_WATCHDOG 0x8ff6
Signature · 1 line
1.7.7.3
PATCH 21/21 ASoC: Sort WM9090 in with the CODEC drivers
In reply to Mark BrownThe driver itself has been a regular CODEC driver for a while now.
--- sound/soc/codecs/Kconfig | 6 +++--- sound/soc/codecs/Makefile | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)
sound/soc/codecs/Kconfig +3 -3
@@ -418,6 +418,9 @@ config SND_SOC_WM8996 config SND_SOC_WM9081 tristate +config SND_SOC_WM9090 + tristate + config SND_SOC_WM9705 tristate
@@ -436,6 +439,3 @@ config SND_SOC_MAX9877 config SND_SOC_TPA6130A2 tristate - -config SND_SOC_WM9090 - tristate
sound/soc/codecs/Makefile +2 -2
@@ -91,6 +91,7 @@ snd-soc-wm8993-objs := wm8993.o snd-soc-wm8994-objs := wm8994.o wm8958-dsp2.o snd-soc-wm8995-objs := wm8995.o snd-soc-wm9081-objs := wm9081.o +snd-soc-wm9090-objs := wm9090.o snd-soc-wm9705-objs := wm9705.o snd-soc-wm9712-objs := wm9712.o snd-soc-wm9713-objs := wm9713.o
@@ -100,7 +101,6 @@ snd-soc-wm-hubs-objs := wm_hubs.o # Amp snd-soc-max9877-objs := max9877.o snd-soc-tpa6130a2-objs := tpa6130a2.o -snd-soc-wm9090-objs := wm9090.o obj-$(CONFIG_SND_SOC_88PM860X) += snd-soc-88pm860x.o obj-$(CONFIG_SND_SOC_AC97_CODEC) += snd-soc-ac97.o
@@ -195,6 +195,7 @@ obj-$(CONFIG_SND_SOC_WM8993) += snd-soc-wm8993.o obj-$(CONFIG_SND_SOC_WM8994) += snd-soc-wm8994.o obj-$(CONFIG_SND_SOC_WM8995) += snd-soc-wm8995.o obj-$(CONFIG_SND_SOC_WM9081) += snd-soc-wm9081.o +obj-$(CONFIG_SND_SOC_WM9090) += snd-soc-wm9090.o obj-$(CONFIG_SND_SOC_WM9705) += snd-soc-wm9705.o obj-$(CONFIG_SND_SOC_WM9712) += snd-soc-wm9712.o obj-$(CONFIG_SND_SOC_WM9713) += snd-soc-wm9713.o
@@ -204,4 +205,3 @@ obj-$(CONFIG_SND_SOC_WM_HUBS) += snd-soc-wm-hubs.o # Amp obj-$(CONFIG_SND_SOC_MAX9877) += snd-soc-max9877.o obj-$(CONFIG_SND_SOC_TPA6130A2) += snd-soc-tpa6130a2.o -obj-$(CONFIG_SND_SOC_WM9090) += snd-soc-wm9090.o
Signature · 1 line
1.7.7.3