Commit 98e82010 authored by Divagar Mohandass's avatar Divagar Mohandass Committed by Wolfram Sang

eeprom: at24: enable runtime pm support

Currently the device is kept in D0, there is an opportunity
to save power by enabling runtime pm.

Device can be daisy chained from PMIC and we can't rely on I2C core
for auto resume/suspend. Driver will decide when to resume/suspend.
Reviewed-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarDivagar Mohandass <divagar.mohandass@intel.com>
Signed-off-by: default avatarWolfram Sang <wsa@the-dreams.de>
parent dbc1ab9c
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/nvmem-provider.h> #include <linux/nvmem-provider.h>
#include <linux/platform_data/at24.h> #include <linux/platform_data/at24.h>
#include <linux/pm_runtime.h>
/* /*
* I2C EEPROMs from most vendors are inexpensive and mostly interchangeable. * I2C EEPROMs from most vendors are inexpensive and mostly interchangeable.
...@@ -501,11 +502,21 @@ static ssize_t at24_eeprom_write_i2c(struct at24_data *at24, const char *buf, ...@@ -501,11 +502,21 @@ static ssize_t at24_eeprom_write_i2c(struct at24_data *at24, const char *buf,
static int at24_read(void *priv, unsigned int off, void *val, size_t count) static int at24_read(void *priv, unsigned int off, void *val, size_t count)
{ {
struct at24_data *at24 = priv; struct at24_data *at24 = priv;
struct i2c_client *client;
char *buf = val; char *buf = val;
int ret;
if (unlikely(!count)) if (unlikely(!count))
return count; return count;
client = at24_translate_offset(at24, &off);
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0) {
pm_runtime_put_noidle(&client->dev);
return ret;
}
/* /*
* Read data from chip, protecting against concurrent updates * Read data from chip, protecting against concurrent updates
* from this host, but not from other I2C masters. * from this host, but not from other I2C masters.
...@@ -518,6 +529,7 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count) ...@@ -518,6 +529,7 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count)
status = at24->read_func(at24, buf, off, count); status = at24->read_func(at24, buf, off, count);
if (status < 0) { if (status < 0) {
mutex_unlock(&at24->lock); mutex_unlock(&at24->lock);
pm_runtime_put(&client->dev);
return status; return status;
} }
buf += status; buf += status;
...@@ -527,17 +539,29 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count) ...@@ -527,17 +539,29 @@ static int at24_read(void *priv, unsigned int off, void *val, size_t count)
mutex_unlock(&at24->lock); mutex_unlock(&at24->lock);
pm_runtime_put(&client->dev);
return 0; return 0;
} }
static int at24_write(void *priv, unsigned int off, void *val, size_t count) static int at24_write(void *priv, unsigned int off, void *val, size_t count)
{ {
struct at24_data *at24 = priv; struct at24_data *at24 = priv;
struct i2c_client *client;
char *buf = val; char *buf = val;
int ret;
if (unlikely(!count)) if (unlikely(!count))
return -EINVAL; return -EINVAL;
client = at24_translate_offset(at24, &off);
ret = pm_runtime_get_sync(&client->dev);
if (ret < 0) {
pm_runtime_put_noidle(&client->dev);
return ret;
}
/* /*
* Write data to chip, protecting against concurrent updates * Write data to chip, protecting against concurrent updates
* from this host, but not from other I2C masters. * from this host, but not from other I2C masters.
...@@ -550,6 +574,7 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) ...@@ -550,6 +574,7 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count)
status = at24->write_func(at24, buf, off, count); status = at24->write_func(at24, buf, off, count);
if (status < 0) { if (status < 0) {
mutex_unlock(&at24->lock); mutex_unlock(&at24->lock);
pm_runtime_put(&client->dev);
return status; return status;
} }
buf += status; buf += status;
...@@ -559,6 +584,8 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count) ...@@ -559,6 +584,8 @@ static int at24_write(void *priv, unsigned int off, void *val, size_t count)
mutex_unlock(&at24->lock); mutex_unlock(&at24->lock);
pm_runtime_put(&client->dev);
return 0; return 0;
} }
...@@ -743,11 +770,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -743,11 +770,16 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
i2c_set_clientdata(client, at24); i2c_set_clientdata(client, at24);
/* enable runtime pm */
pm_runtime_set_active(&client->dev);
pm_runtime_enable(&client->dev);
/* /*
* Perform a one-byte test read to verify that the * Perform a one-byte test read to verify that the
* chip is functional. * chip is functional.
*/ */
err = at24_read(at24, 0, &test_byte, 1); err = at24_read(at24, 0, &test_byte, 1);
pm_runtime_idle(&client->dev);
if (err) { if (err) {
err = -ENODEV; err = -ENODEV;
goto err_clients; goto err_clients;
...@@ -795,6 +827,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id) ...@@ -795,6 +827,8 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
if (at24->client[i]) if (at24->client[i])
i2c_unregister_device(at24->client[i]); i2c_unregister_device(at24->client[i]);
pm_runtime_disable(&client->dev);
return err; return err;
} }
...@@ -810,6 +844,9 @@ static int at24_remove(struct i2c_client *client) ...@@ -810,6 +844,9 @@ static int at24_remove(struct i2c_client *client)
for (i = 1; i < at24->num_addresses; i++) for (i = 1; i < at24->num_addresses; i++)
i2c_unregister_device(at24->client[i]); i2c_unregister_device(at24->client[i]);
pm_runtime_disable(&client->dev);
pm_runtime_set_suspended(&client->dev);
return 0; return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment