ASoC: wm8523: Convert to devm_kzalloc()
Subsystems (3)
PATCH 1/4 ASoC: wm8523: Convert to devm_kzalloc()
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8523.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
sound/soc/codecs/wm8523.c +3 -4
@@ -516,7 +516,8 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,struct wm8523_priv *wm8523;int ret; - wm8523 =kzalloc (sizeof (struct wm8523_priv ),GFP_KERNEL ); + wm8523 =devm_kzalloc (&i2c->dev,sizeof (struct wm8523_priv ), +GFP_KERNEL );if (wm8523 ==NULL )return -ENOMEM ;
@@ -525,8 +526,7 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c, ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm8523, &wm8523_dai,1 ); -if (ret <0 ) -kfree (wm8523); +return ret; }
@@ -534,7 +534,6 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c, static __devexit int wm8523_i2c_remove(struct i2c_client *client) {snd_soc_unregister_codec (&client->dev); -kfree (i2c_get_clientdata (client));return 0 ; }
Signature · 1 line
1.7.10.4
PATCH 2/4 ASoC: wm8523: Move regulator acquisition to I2C probe()
This is better style since we acquire all needed resources before we try to do the ASoC card probe.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8523.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-)
sound/soc/codecs/wm8523.c +12 -14
@@ -402,7 +402,7 @@ static int wm8523_resume(struct snd_soc_codec *codec)static int wm8523_probe (struct snd_soc_codec *codec) {struct wm8523_priv *wm8523 =snd_soc_codec_get_drvdata (codec); -int ret, i; +int ret; wm8523->rate_constraint.list = &wm8523->rate_constraint_list[0 ]; wm8523->rate_constraint.count =
@@ -414,16 +414,6 @@ static int wm8523_probe(struct snd_soc_codec *codec)return ret; } -for (i =0 ; i <ARRAY_SIZE (wm8523->supplies); i++) - wm8523->supplies[i].supply = wm8523_supply_names[i]; - - ret =regulator_bulk_get (codec->dev,ARRAY_SIZE (wm8523->supplies), - wm8523->supplies); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to request supplies: %d\n" , ret); -return ret; - } - ret =regulator_bulk_enable (ARRAY_SIZE (wm8523->supplies), wm8523->supplies);if (ret !=0 ) {
@@ -471,7 +461,6 @@ static int wm8523_probe(struct snd_soc_codec *codec) err_enable:regulator_bulk_disable (ARRAY_SIZE (wm8523->supplies), wm8523->supplies); err_get: -regulator_bulk_free (ARRAY_SIZE (wm8523->supplies), wm8523->supplies);return ret; }
@@ -481,7 +470,6 @@ static int wm8523_remove(struct snd_soc_codec *codec)struct wm8523_priv *wm8523 =snd_soc_codec_get_drvdata (codec);wm8523_set_bias_level (codec,SND_SOC_BIAS_OFF ); -regulator_bulk_free (ARRAY_SIZE (wm8523->supplies), wm8523->supplies);return 0 ; }
@@ -514,13 +502,23 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) {struct wm8523_priv *wm8523; -int ret; +int ret, i; wm8523 =devm_kzalloc (&i2c->dev,sizeof (struct wm8523_priv ),GFP_KERNEL );if (wm8523 ==NULL )return -ENOMEM ; +for (i =0 ; i <ARRAY_SIZE (wm8523->supplies); i++) + wm8523->supplies[i].supply = wm8523_supply_names[i]; + + ret =devm_regulator_bulk_get (&i2c->dev,ARRAY_SIZE (wm8523->supplies), + wm8523->supplies); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to request supplies: %d\n" , ret); +return ret; + } +i2c_set_clientdata (i2c, wm8523); wm8523->control_type =SND_SOC_I2C ;
Signature · 1 line
1.7.10.4
PATCH 3/4 ASoC: wm8523: Convert to direct regmap API usage
In reply to Mark BrownSigned-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8523.c | 69 +++++++++++++++++++++++++-------------------- 1 file changed, 38 insertions(+), 31 deletions(-)
sound/soc/codecs/wm8523.c +38 -31
@@ -17,6 +17,7 @@#include <linux/delay.h> #include <linux/pm.h> #include <linux/i2c.h> +#include <linux/regmap.h> #include <linux/regulator/consumer.h> #include <linux/slab.h> #include <linux/of_device.h>
@@ -39,33 +40,31 @@ static const char *wm8523_supply_names[WM8523_NUM_SUPPLIES] = {/* codec private data */ struct wm8523_priv { -enum snd_soc_control_type control_type; +struct regmap *regmap;struct regulator_bulk_data supplies[WM8523_NUM_SUPPLIES ];unsigned int sysclk;unsigned int rate_constraint_list[WM8523_NUM_RATES ];struct snd_pcm_hw_constraint_list rate_constraint; }; -static const u16 wm8523_reg[WM8523_REGISTER_COUNT ] = { -0x8523 ,/* R0 - DEVICE_ID */ -0x0001 ,/* R1 - REVISION */ -0x0000 ,/* R2 - PSCTRL1 */ -0x1812 ,/* R3 - AIF_CTRL1 */ -0x0000 ,/* R4 - AIF_CTRL2 */ -0x0001 ,/* R5 - DAC_CTRL3 */ -0x0190 ,/* R6 - DAC_GAINL */ -0x0190 ,/* R7 - DAC_GAINR */ -0x0000 ,/* R8 - ZERO_DETECT */ +static const struct reg_default wm8523_reg_defaults[] = { + {2 ,0x0000 },/* R2 - PSCTRL1 */ + {3 ,0x1812 },/* R3 - AIF_CTRL1 */ + {4 ,0x0000 },/* R4 - AIF_CTRL2 */ + {5 ,0x0001 },/* R5 - DAC_CTRL3 */ + {6 ,0x0190 },/* R6 - DAC_GAINL */ + {7 ,0x0190 },/* R7 - DAC_GAINR */ + {8 ,0x0000 },/* R8 - ZERO_DETECT */ }; -static int wm8523_volatile_register (struct snd_soc_codec *codec,unsigned int reg) +static bool wm8523_volatile_register (struct device *dev,unsigned int reg) {switch (reg) {case WM8523_DEVICE_ID :case WM8523_REVISION : -return 1 ; +return true;default : -return 0 ; +return false; } }
@@ -301,8 +300,7 @@ static int wm8523_set_bias_level(struct snd_soc_codec *codec, enum snd_soc_bias_level level) {struct wm8523_priv *wm8523 =snd_soc_codec_get_drvdata (codec); -u16 *reg_cache = codec->reg_cache; -int ret, i; +int ret;switch (level) {case SND_SOC_BIAS_ON :
@@ -325,16 +323,13 @@ static int wm8523_set_bias_level(struct snd_soc_codec *codec,return ret; } +/* Sync back default/cached values */ +regcache_sync (wm8523->regmap); +/* Initial power up */ snd_soc_update_bits (codec,WM8523_PSCTRL1 ,WM8523_SYS_ENA_MASK ,1 ); -/* Sync back default/cached values */ -for (i =WM8523_AIF_CTRL1 ; - i <WM8523_MAX_REGISTER ; i++) -snd_soc_write (codec, i, reg_cache[i]); - -msleep (100 ); }
@@ -408,7 +403,7 @@ static int wm8523_probe(struct snd_soc_codec *codec) wm8523->rate_constraint.count =ARRAY_SIZE (wm8523->rate_constraint_list); - ret =snd_soc_codec_set_cache_io (codec,8 ,16 , wm8523->control_type); + ret =snd_soc_codec_set_cache_io (codec,8 ,16 ,SND_SOC_REGMAP );if (ret !=0 ) {dev_err (codec->dev,"Failed to set cache I/O: %d\n" , ret);return ret;
@@ -426,7 +421,7 @@ static int wm8523_probe(struct snd_soc_codec *codec)dev_err (codec->dev,"Failed to read ID register\n" ); goto err_enable; } -if (ret != wm8523_reg[WM8523_DEVICE_ID ]) { +if (ret !=0x8523 ) {dev_err (codec->dev,"Device is not a WM8523, ID is %x\n" , ret); ret = -EINVAL ; goto err_enable;
@@ -467,8 +462,6 @@ err_get:static int wm8523_remove (struct snd_soc_codec *codec) { -struct wm8523_priv *wm8523 =snd_soc_codec_get_drvdata (codec); -wm8523_set_bias_level (codec,SND_SOC_BIAS_OFF );return 0 ; }
@@ -479,10 +472,6 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8523 = { .suspend = wm8523_suspend, .resume = wm8523_resume, .set_bias_level = wm8523_set_bias_level, - .reg_cache_size = WM8523_REGISTER_COUNT, - .reg_word_size = sizeof(u16), - .reg_cache_default = wm8523_reg, - .volatile_register = wm8523_volatile_register, .controls = wm8523_controls, .num_controls = ARRAY_SIZE(wm8523_controls),
@@ -497,6 +486,18 @@ static const struct of_device_id wm8523_of_match[] = { { }, }; +static const struct regmap_config wm8523_regmap = { + .reg_bits =8 , + .val_bits =16 , + .max_register =WM8523_ZERO_DETECT , + + .reg_defaults = wm8523_reg_defaults, + .num_reg_defaults =ARRAY_SIZE (wm8523_reg_defaults), + .cache_type =REGCACHE_RBTREE , + + .volatile_reg = wm8523_volatile_register, +}; +#if defined(CONFIG_I2C ) || defined(CONFIG_I2C_MODULE )static __devinit int wm8523_i2c_probe (struct i2c_client *i2c,const struct i2c_device_id *id)
@@ -509,6 +510,13 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,if (wm8523 ==NULL )return -ENOMEM ; + wm8523->regmap =devm_regmap_init_i2c (i2c, &wm8523_regmap); +if (IS_ERR (wm8523->regmap)) { + ret =PTR_ERR (wm8523->regmap); +dev_err (&i2c->dev,"Failed to create regmap: %d\n" , ret); +return ret; + } +for (i =0 ; i <ARRAY_SIZE (wm8523->supplies); i++) wm8523->supplies[i].supply = wm8523_supply_names[i];
@@ -520,7 +528,6 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c, }i2c_set_clientdata (i2c, wm8523); - wm8523->control_type =SND_SOC_I2C ; ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm8523, &wm8523_dai,1 );
Signature · 1 line
1.7.10.4
PATCH 4/4 ASoC: wm8523: Move device ID verification and reset to I2C probe
In reply to Mark BrownEnsure that we have confirmed that we've got the device in place before we register with ASoC.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm8523.c | 84 ++++++++++++++++++++------------------------- 1 file changed, 38 insertions(+), 46 deletions(-)
sound/soc/codecs/wm8523.c +38 -46
@@ -68,11 +68,6 @@ static bool wm8523_volatile_register(struct device *dev, unsigned int reg) } } -static int wm8523_reset (struct snd_soc_codec *codec) -{ -return snd_soc_write (codec,WM8523_DEVICE_ID ,0 ); -} - static const DECLARE_TLV_DB_SCALE(dac_tlv, -10000, 25, 0);static const char *wm8523_zd_count_text[] = {
@@ -409,38 +404,6 @@ static int wm8523_probe(struct snd_soc_codec *codec)return ret; } - ret =regulator_bulk_enable (ARRAY_SIZE (wm8523->supplies), - wm8523->supplies); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to enable supplies: %d\n" , ret); - goto err_get; - } - - ret =snd_soc_read (codec,WM8523_DEVICE_ID ); -if (ret <0 ) { -dev_err (codec->dev,"Failed to read ID register\n" ); - goto err_enable; - } -if (ret !=0x8523 ) { -dev_err (codec->dev,"Device is not a WM8523, ID is %x\n" , ret); - ret = -EINVAL ; - goto err_enable; - } - - ret =snd_soc_read (codec,WM8523_REVISION ); -if (ret <0 ) { -dev_err (codec->dev,"Failed to read revision register\n" ); - goto err_enable; - } -dev_info (codec->dev,"revision %c\n" , - (ret &WM8523_CHIP_REV_MASK ) +'A' ); - - ret =wm8523_reset (codec); -if (ret <0 ) { -dev_err (codec->dev,"Failed to issue reset\n" ); - goto err_enable; - } -/* Change some default settings - latch VU and enable ZC */ snd_soc_update_bits (codec,WM8523_DAC_GAINR ,WM8523_DACR_VU ,WM8523_DACR_VU );
@@ -448,16 +411,7 @@ static int wm8523_probe(struct snd_soc_codec *codec)wm8523_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); -/* Bias level configuration will have done an extra enable */ -regulator_bulk_disable (ARRAY_SIZE (wm8523->supplies), wm8523->supplies); -return 0 ; - -err_enable: -regulator_bulk_disable (ARRAY_SIZE (wm8523->supplies), wm8523->supplies); -err_get: - -return ret; }static int wm8523_remove (struct snd_soc_codec *codec)
@@ -503,6 +457,7 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) {struct wm8523_priv *wm8523; +unsigned int val;int ret, i; wm8523 = devm_kzalloc(&i2c->dev, sizeof(struct wm8523_priv),
@@ -527,6 +482,40 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,return ret; } + ret =regulator_bulk_enable (ARRAY_SIZE (wm8523->supplies), + wm8523->supplies); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to enable supplies: %d\n" , ret); +return ret; + } + + ret =regmap_read (wm8523->regmap,WM8523_DEVICE_ID , &val); +if (ret <0 ) { +dev_err (&i2c->dev,"Failed to read ID register\n" ); + goto err_enable; + } +if (val !=0x8523 ) { +dev_err (&i2c->dev,"Device is not a WM8523, ID is %x\n" , ret); + ret = -EINVAL ; + goto err_enable; + } + + ret =regmap_read (wm8523->regmap,WM8523_REVISION , &val); +if (ret <0 ) { +dev_err (&i2c->dev,"Failed to read revision register\n" ); + goto err_enable; + } +dev_info (&i2c->dev,"revision %c\n" , + (val &WM8523_CHIP_REV_MASK ) +'A' ); + + ret =regmap_write (wm8523->regmap,WM8523_DEVICE_ID ,0x8523 ); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to reset device: %d\n" , ret); + goto err_enable; + } + +regulator_bulk_disable (ARRAY_SIZE (wm8523->supplies), wm8523->supplies); +i2c_set_clientdata (i2c, wm8523); ret = snd_soc_register_codec(&i2c->dev,
@@ -534,6 +523,9 @@ static __devinit int wm8523_i2c_probe(struct i2c_client *i2c,return ret; +err_enable: +regulator_bulk_disable (ARRAY_SIZE (wm8523->supplies), wm8523->supplies); +return ret; } static __devexit int wm8523_i2c_remove(struct i2c_client *client)
Signature · 1 line
1.7.10.4