openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: ASoC: cs4270: move power management hooks to snd_soc_codec_device 

Power management for the cs4270 codec is currently implemented as part
of the i2c_driver struct. The disadvantage of doing it this way is that
the callbacks registered in the snd_soc_card struct are called _before_
the codec's callbacks.

That doesn't work, because the snd_soc_card callbacks will most likely
switch down the codec's power domains or pull the reset GPIOs, and
hence make the i2c communication bail out.

Fix this by binding the suspend and resume code to the
snd_soc_codec_device driver model and let the I2C functions only call
the SoC core function for resume and suspend, which do nothing currently
but will do later.

Signed-off-by: Daniel Mack <daniel@caiaq.de>
Cc: Timur Tabi <timur@freescale.com>
Signed-off-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
This commit is contained in:
Daniel Mack 2009-08-05 20:50:43 +02:00 committed by Mark Brown
parent b0a2712ffd
commit 15b5bdaeeb
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
sound/soc/codecs/cs4270.c
View File

@ -806,15 +806,30 @@ static int cs4270_i2c_suspend(struct i2c_client *client, pm_message_t mesg)
{ {
struct cs4270_private *cs4270 = i2c_get_clientdata(client); struct cs4270_private *cs4270 = i2c_get_clientdata(client);
struct snd_soc_codec *codec = &cs4270->codec; struct snd_soc_codec *codec = &cs4270->codec;
int reg = snd_soc_read(codec, CS4270_PWRCTL) | CS4270_PWRCTL_PDN_ALL;
return snd_soc_write(codec, CS4270_PWRCTL, reg); return snd_soc_suspend_device(codec->dev);
} }
static int cs4270_i2c_resume(struct i2c_client *client) static int cs4270_i2c_resume(struct i2c_client *client)
{ {
struct cs4270_private *cs4270 = i2c_get_clientdata(client); struct cs4270_private *cs4270 = i2c_get_clientdata(client);
struct snd_soc_codec *codec = &cs4270->codec; struct snd_soc_codec *codec = &cs4270->codec;
return snd_soc_resume_device(codec->dev);
}
static int cs4270_soc_suspend(struct platform_device *pdev, pm_message_t mesg)
{
struct snd_soc_codec *codec = cs4270_codec;
int reg = snd_soc_read(codec, CS4270_PWRCTL) | CS4270_PWRCTL_PDN_ALL;
return snd_soc_write(codec, CS4270_PWRCTL, reg);
}
static int cs4270_soc_resume(struct platform_device *pdev)
{
struct snd_soc_codec *codec = cs4270_codec;
struct i2c_client *i2c_client = codec->control_data;
int reg; int reg;
/* In case the device was put to hard reset during sleep, we need to /* In case the device was put to hard reset during sleep, we need to
@ -825,7 +840,7 @@ static int cs4270_i2c_resume(struct i2c_client *client)
for (reg = CS4270_FIRSTREG; reg <= CS4270_LASTREG; reg++) { for (reg = CS4270_FIRSTREG; reg <= CS4270_LASTREG; reg++) {
u8 val = snd_soc_read(codec, reg); u8 val = snd_soc_read(codec, reg);
if (i2c_smbus_write_byte_data(client, reg, val)) { if (i2c_smbus_write_byte_data(i2c_client, reg, val)) {
dev_err(codec->dev, "i2c write failed\n"); dev_err(codec->dev, "i2c write failed\n");
return -EIO; return -EIO;
} }
@ -840,6 +855,8 @@ static int cs4270_i2c_resume(struct i2c_client *client)
#else #else
#define cs4270_i2c_suspend NULL #define cs4270_i2c_suspend NULL
#define cs4270_i2c_resume NULL #define cs4270_i2c_resume NULL
#define cs4270_soc_suspend NULL
#define cs4270_soc_resume NULL
#endif /* CONFIG_PM */ #endif /* CONFIG_PM */
/* /*
@ -868,7 +885,9 @@ static struct i2c_driver cs4270_i2c_driver = {
*/ */
struct snd_soc_codec_device soc_codec_device_cs4270 = { struct snd_soc_codec_device soc_codec_device_cs4270 = {
.probe = cs4270_probe, .probe = cs4270_probe,
.remove = cs4270_remove .remove = cs4270_remove,
.suspend = cs4270_soc_suspend,
.resume = cs4270_soc_resume,
}; };
EXPORT_SYMBOL_GPL(soc_codec_device_cs4270); EXPORT_SYMBOL_GPL(soc_codec_device_cs4270);