[v2] ASoC: max98090: add shutdown callback for max98090
diff mbox

Message ID 1428488311-27237-1-git-send-email-wxt@rock-chips.com
State New, archived
Headers show

Commit Message

Caesar Wang April 8, 2015, 10:18 a.m. UTC
To fix pop noise when shutdown,the pop noise during shutdown
is the pmic cutoff power of codec without any notice.

Signed-off-by: jay.xu <xjq@rock-chips.com>
Signed-off-by: zhengxing <zhengxing@rock-chips.com>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>

Serien-cc: linux-kernel@vger.kernel.org
Serien-cc: devicetree@vger.kernel.org
Serien-cc: dianders@chromium.org

---

Changes in v2:
- remove the dev_info(..)
- fix the comment style
- add the max98090_i2c_shutdown() in remove() fuction

 sound/soc/codecs/max98090.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

Comments

Kever Yang April 8, 2015, 10:51 a.m. UTC | #1
Hi Caesar,

On 04/08/2015 06:18 PM, Caesar Wang wrote:
> To fix pop noise when shutdown,the pop noise during shutdown
> is the pmic cutoff power of codec without any notice.
>
> Signed-off-by: jay.xu <xjq@rock-chips.com>
> Signed-off-by: zhengxing <zhengxing@rock-chips.com>
> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
>
> Serien-cc: linux-kernel@vger.kernel.org
> Serien-cc: devicetree@vger.kernel.org
> Serien-cc: dianders@chromium.org
Typo? Should be "Series-cc" here I guess.

Thanks,
- Kever
Caesar Wang April 8, 2015, 11:04 a.m. UTC | #2
Kever,

? 2015?04?08? 18:51, Kever Yang ??:
> Hi Caesar,
>
> On 04/08/2015 06:18 PM, Caesar Wang wrote:
>> To fix pop noise when shutdown,the pop noise during shutdown
>> is the pmic cutoff power of codec without any notice.
>>
>> Signed-off-by: jay.xu <xjq@rock-chips.com>
>> Signed-off-by: zhengxing <zhengxing@rock-chips.com>
>> Signed-off-by: Caesar Wang <wxt@rock-chips.com>
>>
>> Serien-cc: linux-kernel@vger.kernel.org
>> Serien-cc: devicetree@vger.kernel.org
>> Serien-cc: dianders@chromium.org
> Typo? Should be "Series-cc" here I guess.
>

Yeah,it's a mistake from my finger.
I fix it  in v3 patch.

Thanks!
> Thanks,
> - Kever
>
>
>

Patch
diff mbox

diff --git a/sound/soc/codecs/max98090.c b/sound/soc/codecs/max98090.c
index b112b1c..e59013a 100644
--- a/sound/soc/codecs/max98090.c
+++ b/sound/soc/codecs/max98090.c
@@ -2607,10 +2607,26 @@  err_enable:
 
 static int max98090_i2c_remove(struct i2c_client *client)
 {
+	max98090_i2c_shutdown(client);
 	snd_soc_unregister_codec(&client->dev);
 	return 0;
 }
 
+static void max98090_i2c_shutdown(struct i2c_client *i2c)
+{
+	struct max98090_priv *max98090 = dev_get_drvdata(&i2c->dev);
+
+	/*
+	 * Enable volume smoothing, disable zero cross.  This will cause
+	 * a quick 40ms ramp to mute on shutdown.
+	 */
+	regmap_write(max98090->regmap,
+		M98090_REG_LEVEL_CONTROL, M98090_VSENN_MASK);
+	regmap_write(max98090->regmap,
+		M98090_REG_DEVICE_SHUTDOWN, 0x00);
+	msleep(40);
+}
+
 #ifdef CONFIG_PM
 static int max98090_runtime_resume(struct device *dev)
 {
@@ -2697,6 +2713,7 @@  static struct i2c_driver max98090_i2c_driver = {
 	},
 	.probe  = max98090_i2c_probe,
 	.remove = max98090_i2c_remove,
+	.shutdown = max98090_i2c_shutdown,
 	.id_table = max98090_i2c_id,
 };