diff options
| author | Jin Park <jinyoungp@nvidia.com> | 2011-10-27 19:14:18 +0900 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2011-10-31 15:58:37 -0700 |
| commit | 9ba5f1f22d73fe62d0f509fd6cad26f34e25a017 (patch) | |
| tree | 7756185043f92359d296f251cbc5371a5409633d | |
| parent | 80acd66deffa20a391e5324fc9038b7fab42d08d (diff) | |
mfd: max77663: Move sleep enable setting from suspend to resume
Moving sleep enable setting from suspend to resume.
And add sleep enable setting into probe.
Bug 849360
Change-Id: I6d51bfeb9912b84c3c49dc00fa9937fb3b5c4c50
Signed-off-by: Jin Park <jinyoungp@nvidia.com>
Reviewed-on: http://git-master/r/60656
Tested-by: Gerrit_Virtual_Submit
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
| -rw-r--r-- | drivers/mfd/max77663-core.c | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/drivers/mfd/max77663-core.c b/drivers/mfd/max77663-core.c index d0634ed70ac2..a354a2a58a37 100644 --- a/drivers/mfd/max77663-core.c +++ b/drivers/mfd/max77663-core.c @@ -363,6 +363,22 @@ int max77663_power_off(void) } EXPORT_SYMBOL(max77663_power_off); +static int max77663_sleep_enable(struct max77663_chip *chip) +{ + int ret; + + /* Enable sleep that AP can be placed into sleep mode + * by pulling EN1 low */ + ret = max77663_set_bits(chip->dev, MAX77663_REG_ONOFF_CFG1, + ONOFF_SLPEN_MASK, ONOFF_SLPEN_MASK, 0); + if (ret < 0) + dev_err(chip->dev, + "sleep_enable: Failed to set on/off config1\n", + MAX77663_REG_ONOFF_CFG1); + + return ret; +} + static inline int max77663_cache_write(struct device *dev, u8 addr, u8 mask, u8 val, u8 *cache) { @@ -1279,6 +1295,7 @@ static int max77663_probe(struct i2c_client *client, max77663_gpio_init(chip); max77663_irq_init(chip); max77663_debugfs_init(chip); + max77663_sleep_enable(chip); ret = mfd_add_devices(&client->dev, 0, pdata->sub_devices, pdata->num_subdevs, NULL, 0); @@ -1319,31 +1336,23 @@ static int __devexit max77663_remove(struct i2c_client *client) static int max77663_suspend(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); - struct max77663_chip *chip = i2c_get_clientdata(client); - int ret; if (client->irq) disable_irq(client->irq); - /* Enable sleep that AP can be placed into sleep mode - * by pulling EN1 low */ - ret = max77663_set_bits(chip->dev, MAX77663_REG_ONOFF_CFG1, - ONOFF_SLPEN_MASK, ONOFF_SLPEN_MASK, 0); - if (ret < 0) - dev_err(&client->dev, - "suspend: Failed to set ONOFF_CFG1(0x%02x)\n", - MAX77663_REG_ONOFF_CFG1); - return 0; } static int max77663_resume(struct device *dev) { struct i2c_client *client = to_i2c_client(dev); + struct max77663_chip *chip = i2c_get_clientdata(client); if (client->irq) enable_irq(client->irq); + max77663_sleep_enable(chip); + return 0; } #else |