ASoC: wm8904: Fix GPIO and MICBIAS initialisation for regmap conversion
Subsystems (3)
PATCH 1/5 ASoC: wm8904: Fix GPIO and MICBIAS initialisation for regmap conversion
We no longer have a flat ASoC cache so can't peer directly into the array any more but should instead use the register I/O functions to update the cache.
--- sound/soc/codecs/wm8904.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-)
sound/soc/codecs/wm8904.c +8 -5
@@ -2084,7 +2084,6 @@ static int wm8904_probe(struct snd_soc_codec *codec) {struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec);struct wm8904_pdata *pdata = wm8904->pdata; -u16 *reg_cache = codec->reg_cache;int ret, i; codec->cache_sync =1 ;
@@ -2180,14 +2179,18 @@ static int wm8904_probe(struct snd_soc_codec *codec)if (!pdata->gpio_cfg[i])continue ; - reg_cache[WM8904_GPIO_CONTROL_1 + i] - = pdata->gpio_cfg[i] &0xffff ; +regmap_update_bits (wm8904->regmap, +WM8904_GPIO_CONTROL_1 + i, +0xffff , + pdata->gpio_cfg[i]); }/* Zero is the default value for these anyway */ for (i =0 ; i <WM8904_MIC_REGS ; i++) - reg_cache[WM8904_MIC_BIAS_CONTROL_0 + i] - = pdata->mic_cfg[i]; +regmap_update_bits (wm8904->regmap, +WM8904_MIC_BIAS_CONTROL_0 + i, +0xffff , + pdata->mic_cfg[i]); }/* Set Class W by default - this will be managed by the Class
Signature · 1 line
1.7.10
PATCH 2/5 ASoC: wm8904: Fix cache only management
We should be using the regmap API consistently for all the cache only configuration and we should be going cache only before we power down the supplies.
--- sound/soc/codecs/wm8904.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-)
sound/soc/codecs/wm8904.c +4 -9
@@ -1863,6 +1863,7 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,return ret; } +regcache_cache_only (wm8904->regmap, false);regcache_sync (wm8904->regmap);/* Enable bias */
@@ -1899,14 +1900,8 @@ static int wm8904_set_bias_level(struct snd_soc_codec *codec,snd_soc_update_bits (codec,WM8904_BIAS_CONTROL_0 ,WM8904_BIAS_ENA ,0 ); -#ifdef CONFIG_REGULATOR -/* Post 2.6.34 we will be able to get a callback when -* the regulators are disabled which we can use but -* for now just assume that the power will be cut if -* the regulator API is in use. -*/ - codec->cache_sync =1 ; -#endif +regcache_cache_only (wm8904->regmap, true); +regcache_mark_dirty (wm8904->regmap);regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies);
@@ -2086,7 +2081,6 @@ static int wm8904_probe(struct snd_soc_codec *codec)struct wm8904_pdata *pdata = wm8904->pdata;int ret, i; - codec->cache_sync =1 ; codec->control_data = wm8904->regmap;switch (wm8904->devtype) {
@@ -2149,6 +2143,7 @@ static int wm8904_probe(struct snd_soc_codec *codec) goto err_enable; } +regcache_cache_only (wm8904->regmap, true);/* Change some default settings - latch VU and enable ZC */ snd_soc_update_bits (codec,WM8904_ADC_DIGITAL_VOLUME_LEFT ,WM8904_ADC_VU ,WM8904_ADC_VU );
Signature · 1 line
1.7.10
PATCH 3/5 ASoC: wm8904: Rely entirely on the core for bias level management
In reply to Mark BrownEven though the WM8904 is able to use idle_bias_off during both probe and resume we were needlessly leaving the device in standby mode. Instead power the device down as soon as we've confirmed that we can talk to it and don't manage the bias level at all over suspend and resume, the core will take us down to our minimum power level.
--- sound/soc/codecs/wm8904.c | 30 +++--------------------------- 1 file changed, 3 insertions(+), 27 deletions(-)
sound/soc/codecs/wm8904.c +3 -27
@@ -1945,25 +1945,6 @@ static struct snd_soc_dai_driver wm8904_dai = { .symmetric_rates = 1, }; -#ifdef CONFIG_PM -static int wm8904_suspend (struct snd_soc_codec *codec) -{ -wm8904_set_bias_level (codec,SND_SOC_BIAS_OFF ); - -return 0 ; -} - -static int wm8904_resume (struct snd_soc_codec *codec) -{ -wm8904_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); - -return 0 ; -} -#else -#define wm8904_suspend NULL -#define wm8904_resume NULL -#endif -static void wm8904_handle_retune_mobile_pdata (struct snd_soc_codec *codec) {struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec);
@@ -2143,7 +2124,10 @@ static int wm8904_probe(struct snd_soc_codec *codec) goto err_enable; } +/* Can leave the device powered off until we need it */ regcache_cache_only (wm8904->regmap, true); +regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies); +/* Change some default settings - latch VU and enable ZC */ snd_soc_update_bits (codec,WM8904_ADC_DIGITAL_VOLUME_LEFT ,WM8904_ADC_VU ,WM8904_ADC_VU );
@@ -2198,11 +2182,6 @@ static int wm8904_probe(struct snd_soc_codec *codec)snd_soc_update_bits (codec,WM8904_BIAS_CONTROL_0 ,WM8904_POBCTRL ,0 ); -wm8904_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); - -/* Bias level configuration will have done an extra enable */ -regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies); -wm8904_handle_pdata (codec);wm8904_add_widgets (codec);
@@ -2220,7 +2199,6 @@ static int wm8904_remove(struct snd_soc_codec *codec) {struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec); -wm8904_set_bias_level (codec,SND_SOC_BIAS_OFF );regulator_bulk_free (ARRAY_SIZE (wm8904->supplies), wm8904->supplies);kfree (wm8904->retune_mobile_texts);kfree (wm8904->drc_texts);
@@ -2231,8 +2209,6 @@ static int wm8904_remove(struct snd_soc_codec *codec)static struct snd_soc_codec_driver soc_codec_dev_wm8904 = { .probe = wm8904_probe, .remove = wm8904_remove, - .suspend = wm8904_suspend, - .resume = wm8904_resume, .set_bias_level = wm8904_set_bias_level, .idle_bias_off = true, };
Signature · 1 line
1.7.10
PATCH 4/5 ASoC: wm8904: Move regulator acquisition and device identification to I2C
In reply to Mark BrownIt's more idiomatic to have the resource allocation at this level.
--- sound/soc/codecs/wm8904.c | 112 +++++++++++++++++++++------------------------ 1 file changed, 51 insertions(+), 61 deletions(-)
sound/soc/codecs/wm8904.c +51 -61
@@ -314,11 +314,6 @@ static bool wm8904_readable_register(struct device *dev, unsigned int reg) } } -static int wm8904_reset (struct snd_soc_codec *codec) -{ -return snd_soc_write (codec,WM8904_SW_RESET_AND_ID ,0 ); -} -static int wm8904_configure_clocking (struct snd_soc_codec *codec) {struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec);
@@ -2082,52 +2077,6 @@ static int wm8904_probe(struct snd_soc_codec *codec)return ret; } -for (i =0 ; i <ARRAY_SIZE (wm8904->supplies); i++) - wm8904->supplies[i].supply = wm8904_supply_names[i]; - - ret =regulator_bulk_get (codec->dev,ARRAY_SIZE (wm8904->supplies), - wm8904->supplies); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to request supplies: %d\n" , ret); -return ret; - } - - ret =regulator_bulk_enable (ARRAY_SIZE (wm8904->supplies), - wm8904->supplies); -if (ret !=0 ) { -dev_err (codec->dev,"Failed to enable supplies: %d\n" , ret); - goto err_get; - } - - ret =snd_soc_read (codec,WM8904_SW_RESET_AND_ID ); -if (ret <0 ) { -dev_err (codec->dev,"Failed to read ID register\n" ); - goto err_enable; - } -if (ret !=0x8904 ) { -dev_err (codec->dev,"Device is not a WM8904, ID is %x\n" , ret); - ret = -EINVAL ; - goto err_enable; - } - - ret =snd_soc_read (codec,WM8904_REVISION ); -if (ret <0 ) { -dev_err (codec->dev,"Failed to read device revision: %d\n" , - ret); - goto err_enable; - } -dev_info (codec->dev,"revision %c\n" , ret +'A' ); - - ret =wm8904_reset (codec); -if (ret <0 ) { -dev_err (codec->dev,"Failed to issue reset\n" ); - goto err_enable; - } - -/* Can leave the device powered off until we need it */ -regcache_cache_only (wm8904->regmap, true); -regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies); -/* Change some default settings - latch VU and enable ZC */ snd_soc_update_bits (codec,WM8904_ADC_DIGITAL_VOLUME_LEFT ,WM8904_ADC_VU ,WM8904_ADC_VU );
@@ -2187,19 +2136,12 @@ static int wm8904_probe(struct snd_soc_codec *codec)wm8904_add_widgets (codec);return 0 ; - -err_enable: -regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies); -err_get: -regulator_bulk_free (ARRAY_SIZE (wm8904->supplies), wm8904->supplies); -return ret; }static int wm8904_remove (struct snd_soc_codec *codec) {struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec); -regulator_bulk_free (ARRAY_SIZE (wm8904->supplies), wm8904->supplies);kfree (wm8904->retune_mobile_texts);kfree (wm8904->drc_texts);
@@ -2230,7 +2172,8 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) {struct wm8904_priv *wm8904; -int ret; +unsigned int val; +int ret, i; wm8904 =devm_kzalloc (&i2c->dev,sizeof (struct wm8904_priv ),GFP_KERNEL );
@@ -2249,14 +2192,61 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c,i2c_set_clientdata (i2c, wm8904); wm8904->pdata = i2c->dev.platform_data; +for (i =0 ; i <ARRAY_SIZE (wm8904->supplies); i++) + wm8904->supplies[i].supply = wm8904_supply_names[i]; + + ret =devm_regulator_bulk_get (&i2c->dev,ARRAY_SIZE (wm8904->supplies), + wm8904->supplies); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to request supplies: %d\n" , ret); +return ret; + } + + ret =regulator_bulk_enable (ARRAY_SIZE (wm8904->supplies), + wm8904->supplies); +if (ret !=0 ) { +dev_err (&i2c->dev,"Failed to enable supplies: %d\n" , ret); +return ret; + } + + ret =regmap_read (wm8904->regmap,WM8904_SW_RESET_AND_ID , &val); +if (ret <0 ) { +dev_err (&i2c->dev,"Failed to read ID register: %d\n" , ret); + goto err_enable; + } +if (val !=0x8904 ) { +dev_err (&i2c->dev,"Device is not a WM8904, ID is %x\n" , val); + ret = -EINVAL ; + goto err_enable; + } + + ret =regmap_read (wm8904->regmap,WM8904_REVISION , &val); +if (ret <0 ) { +dev_err (&i2c->dev,"Failed to read device revision: %d\n" , + ret); + goto err_enable; + } +dev_info (&i2c->dev,"revision %c\n" , val +'A' ); + + ret =regmap_write (wm8904->regmap,WM8904_SW_RESET_AND_ID ,0 ); +if (ret <0 ) { +dev_err (&i2c->dev,"Failed to issue reset: %d\n" , ret); + goto err_enable; + } + +/* Can leave the device powered off until we need it */ +regcache_cache_only (wm8904->regmap, true); +regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies); + ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm8904, &wm8904_dai,1 );if (ret !=0 ) - goto err; +return ret;return 0 ; -err: +err_enable: +regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies);return ret; }
Signature · 1 line
1.7.10
PATCH 5/5 ASoC: wm8904: Move register default setup into I2C probe()
In reply to Mark BrownGet it done as early as possible, it's neater and minimises the time the pins aren't configured as requested.
--- sound/soc/codecs/wm8904.c | 110 ++++++++++++++++++++++----------------------- 1 file changed, 55 insertions(+), 55 deletions(-)
sound/soc/codecs/wm8904.c +55 -55
@@ -2055,7 +2055,7 @@ static int wm8904_probe(struct snd_soc_codec *codec) {struct wm8904_priv *wm8904 =snd_soc_codec_get_drvdata (codec);struct wm8904_pdata *pdata = wm8904->pdata; -int ret, i; +int ret; codec->control_data = wm8904->regmap;
@@ -2077,60 +2077,6 @@ static int wm8904_probe(struct snd_soc_codec *codec)return ret; } -/* Change some default settings - latch VU and enable ZC */ -snd_soc_update_bits (codec,WM8904_ADC_DIGITAL_VOLUME_LEFT , -WM8904_ADC_VU ,WM8904_ADC_VU ); -snd_soc_update_bits (codec,WM8904_ADC_DIGITAL_VOLUME_RIGHT , -WM8904_ADC_VU ,WM8904_ADC_VU ); -snd_soc_update_bits (codec,WM8904_DAC_DIGITAL_VOLUME_LEFT , -WM8904_DAC_VU ,WM8904_DAC_VU ); -snd_soc_update_bits (codec,WM8904_DAC_DIGITAL_VOLUME_RIGHT , -WM8904_DAC_VU ,WM8904_DAC_VU ); -snd_soc_update_bits (codec,WM8904_ANALOGUE_OUT1_LEFT , -WM8904_HPOUT_VU |WM8904_HPOUTLZC , -WM8904_HPOUT_VU |WM8904_HPOUTLZC ); -snd_soc_update_bits (codec,WM8904_ANALOGUE_OUT1_RIGHT , -WM8904_HPOUT_VU |WM8904_HPOUTRZC , -WM8904_HPOUT_VU |WM8904_HPOUTRZC ); -snd_soc_update_bits (codec,WM8904_ANALOGUE_OUT2_LEFT , -WM8904_LINEOUT_VU |WM8904_LINEOUTLZC , -WM8904_LINEOUT_VU |WM8904_LINEOUTLZC ); -snd_soc_update_bits (codec,WM8904_ANALOGUE_OUT2_RIGHT , -WM8904_LINEOUT_VU |WM8904_LINEOUTRZC , -WM8904_LINEOUT_VU |WM8904_LINEOUTRZC ); -snd_soc_update_bits (codec,WM8904_CLOCK_RATES_0 , -WM8904_SR_MODE ,0 ); - -/* Apply configuration from the platform data. */ -if (wm8904->pdata) { -for (i =0 ; i <WM8904_GPIO_REGS ; i++) { -if (!pdata->gpio_cfg[i]) -continue ; - -regmap_update_bits (wm8904->regmap, -WM8904_GPIO_CONTROL_1 + i, -0xffff , - pdata->gpio_cfg[i]); - } - -/* Zero is the default value for these anyway */ -for (i =0 ; i <WM8904_MIC_REGS ; i++) -regmap_update_bits (wm8904->regmap, -WM8904_MIC_BIAS_CONTROL_0 + i, -0xffff , - pdata->mic_cfg[i]); - } - -/* Set Class W by default - this will be managed by the Class -* G widget at runtime where bypass paths are available. -*/ -snd_soc_update_bits (codec,WM8904_CLASS_W_0 , -WM8904_CP_DYN_PWR ,WM8904_CP_DYN_PWR ); - -/* Use normal bias source */ -snd_soc_update_bits (codec,WM8904_BIAS_CONTROL_0 , -WM8904_POBCTRL ,0 ); -wm8904_handle_pdata (codec);wm8904_add_widgets (codec);
@@ -2234,6 +2180,60 @@ static __devinit int wm8904_i2c_probe(struct i2c_client *i2c, goto err_enable; } +/* Change some default settings - latch VU and enable ZC */ +regmap_update_bits (wm8904->regmap,WM8904_ADC_DIGITAL_VOLUME_LEFT , +WM8904_ADC_VU ,WM8904_ADC_VU ); +regmap_update_bits (wm8904->regmap,WM8904_ADC_DIGITAL_VOLUME_RIGHT , +WM8904_ADC_VU ,WM8904_ADC_VU ); +regmap_update_bits (wm8904->regmap,WM8904_DAC_DIGITAL_VOLUME_LEFT , +WM8904_DAC_VU ,WM8904_DAC_VU ); +regmap_update_bits (wm8904->regmap,WM8904_DAC_DIGITAL_VOLUME_RIGHT , +WM8904_DAC_VU ,WM8904_DAC_VU ); +regmap_update_bits (wm8904->regmap,WM8904_ANALOGUE_OUT1_LEFT , +WM8904_HPOUT_VU |WM8904_HPOUTLZC , +WM8904_HPOUT_VU |WM8904_HPOUTLZC ); +regmap_update_bits (wm8904->regmap,WM8904_ANALOGUE_OUT1_RIGHT , +WM8904_HPOUT_VU |WM8904_HPOUTRZC , +WM8904_HPOUT_VU |WM8904_HPOUTRZC ); +regmap_update_bits (wm8904->regmap,WM8904_ANALOGUE_OUT2_LEFT , +WM8904_LINEOUT_VU |WM8904_LINEOUTLZC , +WM8904_LINEOUT_VU |WM8904_LINEOUTLZC ); +regmap_update_bits (wm8904->regmap,WM8904_ANALOGUE_OUT2_RIGHT , +WM8904_LINEOUT_VU |WM8904_LINEOUTRZC , +WM8904_LINEOUT_VU |WM8904_LINEOUTRZC ); +regmap_update_bits (wm8904->regmap,WM8904_CLOCK_RATES_0 , +WM8904_SR_MODE ,0 ); + +/* Apply configuration from the platform data. */ +if (wm8904->pdata) { +for (i =0 ; i <WM8904_GPIO_REGS ; i++) { +if (!wm8904->pdata->gpio_cfg[i]) +continue ; + +regmap_update_bits (wm8904->regmap, +WM8904_GPIO_CONTROL_1 + i, +0xffff , + wm8904->pdata->gpio_cfg[i]); + } + +/* Zero is the default value for these anyway */ +for (i =0 ; i <WM8904_MIC_REGS ; i++) +regmap_update_bits (wm8904->regmap, +WM8904_MIC_BIAS_CONTROL_0 + i, +0xffff , + wm8904->pdata->mic_cfg[i]); + } + +/* Set Class W by default - this will be managed by the Class +* G widget at runtime where bypass paths are available. +*/ +regmap_update_bits (wm8904->regmap,WM8904_CLASS_W_0 , +WM8904_CP_DYN_PWR ,WM8904_CP_DYN_PWR ); + +/* Use normal bias source */ +regmap_update_bits (wm8904->regmap,WM8904_BIAS_CONTROL_0 , +WM8904_POBCTRL ,0 ); +/* Can leave the device powered off until we need it */ regcache_cache_only (wm8904->regmap, true);regulator_bulk_disable (ARRAY_SIZE (wm8904->supplies), wm8904->supplies);
Signature · 1 line
1.7.10