ASoC: wm9081: Move WM9081 IRQ platform data handling into I2C probe
Subsystems (3)
PATCH 1/2 ASoC: wm9081: Move WM9081 IRQ platform data handling into I2C probe
Better style and better supports idle_bias_off which we're going to implement.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm9081.c | 20 +++++++++----------- 1 files changed, 9 insertions(+), 11 deletions(-)
sound/soc/codecs/wm9081.c +9 -11
@@ -1258,7 +1258,6 @@ static int wm9081_probe(struct snd_soc_codec *codec) {struct wm9081_priv *wm9081 =snd_soc_codec_get_drvdata (codec);int ret; -u16 reg; codec->control_data = wm9081->regmap;
@@ -1268,16 +1267,6 @@ static int wm9081_probe(struct snd_soc_codec *codec)return ret; } - reg =0 ; -if (wm9081->pdata.irq_high) - reg |=WM9081_IRQ_POL ; -if (!wm9081->pdata.irq_cmos) - reg |=WM9081_IRQ_OP_CTRL ; -snd_soc_update_bits (codec,WM9081_INTERRUPT_CONTROL , -WM9081_IRQ_POL |WM9081_IRQ_OP_CTRL , reg); - -wm9081_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); -/* Enable zero cross by default */ snd_soc_update_bits (codec,WM9081_ANALOGUE_LINEOUT ,WM9081_LINEOUTZC ,WM9081_LINEOUTZC );
@@ -1395,6 +1384,15 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,memcpy (&wm9081->pdata,dev_get_platdata (&i2c->dev),sizeof (wm9081->pdata)); + reg =0 ; +if (wm9081->pdata.irq_high) + reg |=WM9081_IRQ_POL ; +if (!wm9081->pdata.irq_cmos) + reg |=WM9081_IRQ_OP_CTRL ; +regmap_update_bits (wm9081->regmap,WM9081_INTERRUPT_CONTROL , +WM9081_IRQ_POL |WM9081_IRQ_OP_CTRL , reg); + + ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm9081, &wm9081_dai,1 );if (ret <0 )
Signature · 1 line
1.7.9.rc1
PATCH 2/2 ASoC: wm9081: Use idle_bias_off
The main role of the WM9081 is as a class D speaker amplifier so there is no concern about pops. There are also very few registers and a fast power up time so we can happily mark the driver as idle_bias_off.
Signed-off-by Mark Brown <[email protected]>
--- sound/soc/codecs/wm9081.c | 35 ++++++++++------------------------- 1 files changed, 10 insertions(+), 25 deletions(-)
sound/soc/codecs/wm9081.c +10 -25
@@ -824,6 +824,8 @@ static const struct snd_soc_dapm_route wm9081_audio_paths[] = {static int wm9081_set_bias_level (struct snd_soc_codec *codec,enum snd_soc_bias_level level) { +struct wm9081_priv *wm9081 =snd_soc_codec_get_drvdata (codec); +switch (level) {case SND_SOC_BIAS_ON :break ;
@@ -841,6 +843,9 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec,case SND_SOC_BIAS_STANDBY :/* Initial cold start */ if (codec->dapm.bias_level ==SND_SOC_BIAS_OFF ) { +regcache_cache_only (wm9081->regmap, false); +regcache_sync (wm9081->regmap); +/* Disable LINEOUT discharge */ snd_soc_update_bits (codec,WM9081_ANTI_POP_CONTROL ,WM9081_LINEOUT_DISCH ,0 );
@@ -892,6 +897,8 @@ static int wm9081_set_bias_level(struct snd_soc_codec *codec,snd_soc_update_bits (codec,WM9081_ANTI_POP_CONTROL ,WM9081_LINEOUT_DISCH ,WM9081_LINEOUT_DISCH ); + +regcache_cache_only (wm9081->regmap, true);break ; }
@@ -1289,38 +1296,15 @@ static int wm9081_remove(struct snd_soc_codec *codec)return 0 ; } -#ifdef CONFIG_PM -static int wm9081_suspend (struct snd_soc_codec *codec) -{ -wm9081_set_bias_level (codec,SND_SOC_BIAS_OFF ); - -return 0 ; -} - -static int wm9081_resume (struct snd_soc_codec *codec) -{ -struct wm9081_priv *wm9081 =snd_soc_codec_get_drvdata (codec); - -regcache_sync (wm9081->regmap); - -wm9081_set_bias_level (codec,SND_SOC_BIAS_STANDBY ); - -return 0 ; -} -#else -#define wm9081_suspend NULL -#define wm9081_resume NULL -#endif -static struct snd_soc_codec_driver soc_codec_dev_wm9081 = { .probe = wm9081_probe, .remove = wm9081_remove, - .suspend = wm9081_suspend, - .resume = wm9081_resume, .set_sysclk = wm9081_set_sysclk, .set_bias_level = wm9081_set_bias_level, + .idle_bias_off = true, + .controls = wm9081_snd_controls, .num_controls =ARRAY_SIZE (wm9081_snd_controls), .dapm_widgets = wm9081_dapm_widgets,
@@ -1392,6 +1376,7 @@ static __devinit int wm9081_i2c_probe(struct i2c_client *i2c,regmap_update_bits (wm9081->regmap,WM9081_INTERRUPT_CONTROL ,WM9081_IRQ_POL |WM9081_IRQ_OP_CTRL , reg); +regcache_cache_only (wm9081->regmap, true); ret =snd_soc_register_codec (&i2c->dev, &soc_codec_dev_wm9081, &wm9081_dai,1 );
Signature · 1 line
1.7.9.rc1