From f4bf13ef1c43737f81a70d0935c887359af56efa Mon Sep 17 00:00:00 2001 From: Graeme Gregory Date: Wed, 30 Apr 2008 20:26:45 +0200 Subject: [PATCH] --- yaml --- r: 95415 b: refs/heads/master c: fd403dc84f29aee613d13bde5656ba74cdee1e7b h: refs/heads/master i: 95413: 958f5b0a2bd5d14a7df48802030283e089d2aa29 95411: 4798b27472010ebf3336c2692223d57413f4e3a0 95407: 686c54c290abc4b0f65f634f042965a71b679381 v: v3 --- [refs] | 2 +- trunk/sound/soc/s3c24xx/neo1973_wm8753.c | 32 ++++++++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9c0f49f7fd70..d65265a3a3c5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 443590e6f1823cd4bc1199cc658074bc3e30acbf +refs/heads/master: fd403dc84f29aee613d13bde5656ba74cdee1e7b diff --git a/trunk/sound/soc/s3c24xx/neo1973_wm8753.c b/trunk/sound/soc/s3c24xx/neo1973_wm8753.c index c8caddffc42d..0e9d1c5f2484 100644 --- a/trunk/sound/soc/s3c24xx/neo1973_wm8753.c +++ b/trunk/sound/soc/s3c24xx/neo1973_wm8753.c @@ -616,6 +616,35 @@ static int lm4857_i2c_attach(struct i2c_adapter *adap) return i2c_probe(adap, &addr_data, lm4857_amp_probe); } +static u8 lm4857_state; + +static int lm4857_suspend(struct i2c_client *dev, pm_message_t state) +{ + dev_dbg(&dev->dev, "lm4857_suspend\n"); + lm4857_state = lm4857_regs[LM4857_CTRL] & 0xf; + if (lm4857_state) { + lm4857_regs[LM4857_CTRL] &= 0xf0; + lm4857_write_regs(); + } + return 0; +} + +static int lm4857_resume(struct i2c_client *dev) +{ + if (lm4857_state) { + lm4857_regs[LM4857_CTRL] |= (lm4857_state & 0x0f); + lm4857_write_regs(); + } + return 0; +} + +static void lm4857_shutdown(struct i2c_client *dev) +{ + dev_dbg(&dev->dev, "lm4857_shutdown\n"); + lm4857_regs[LM4857_CTRL] &= 0xf0; + lm4857_write_regs(); +} + /* corgi i2c codec control layer */ static struct i2c_driver lm4857_i2c_driver = { .driver = { @@ -623,6 +652,9 @@ static struct i2c_driver lm4857_i2c_driver = { .owner = THIS_MODULE, }, .id = I2C_DRIVERID_LM4857, + .suspend = lm4857_suspend, + .resume = lm4857_resume, + .shutdown = lm4857_shutdown, .attach_adapter = lm4857_i2c_attach, .detach_client = lm4857_i2c_detach, .command = NULL,