|
@@ -64,11 +64,8 @@ struct at24_client {
|
|
|
struct at24_data {
|
|
|
struct at24_platform_data chip;
|
|
|
int use_smbus;
|
|
|
- int use_smbus_write;
|
|
|
|
|
|
ssize_t (*read_func)(struct at24_data *, char *, unsigned int, size_t);
|
|
|
- ssize_t (*write_func)(struct at24_data *,
|
|
|
- const char *, unsigned int, size_t);
|
|
|
|
|
|
/*
|
|
|
* Lock protects against activities from other Linux tasks,
|
|
@@ -76,7 +73,6 @@ struct at24_data {
|
|
|
*/
|
|
|
struct mutex lock;
|
|
|
|
|
|
- u8 *writebuf;
|
|
|
unsigned write_max;
|
|
|
unsigned num_addresses;
|
|
|
|
|
@@ -482,62 +478,6 @@ static size_t at24_adjust_write_count(struct at24_data *at24,
|
|
|
return count;
|
|
|
}
|
|
|
|
|
|
-static ssize_t at24_eeprom_write_smbus_block(struct at24_data *at24,
|
|
|
- const char *buf,
|
|
|
- unsigned int offset, size_t count)
|
|
|
-{
|
|
|
- unsigned long timeout, write_time;
|
|
|
- struct at24_client *at24_client;
|
|
|
- struct i2c_client *client;
|
|
|
- ssize_t status = 0;
|
|
|
-
|
|
|
- at24_client = at24_translate_offset(at24, &offset);
|
|
|
- client = at24_client->client;
|
|
|
- count = at24_adjust_write_count(at24, offset, count);
|
|
|
-
|
|
|
- loop_until_timeout(timeout, write_time) {
|
|
|
- status = i2c_smbus_write_i2c_block_data(client,
|
|
|
- offset, count, buf);
|
|
|
- if (status == 0)
|
|
|
- status = count;
|
|
|
-
|
|
|
- dev_dbg(&client->dev, "write %zu@%d --> %zd (%ld)\n",
|
|
|
- count, offset, status, jiffies);
|
|
|
-
|
|
|
- if (status == count)
|
|
|
- return count;
|
|
|
- }
|
|
|
-
|
|
|
- return -ETIMEDOUT;
|
|
|
-}
|
|
|
-
|
|
|
-static ssize_t at24_eeprom_write_smbus_byte(struct at24_data *at24,
|
|
|
- const char *buf,
|
|
|
- unsigned int offset, size_t count)
|
|
|
-{
|
|
|
- unsigned long timeout, write_time;
|
|
|
- struct at24_client *at24_client;
|
|
|
- struct i2c_client *client;
|
|
|
- ssize_t status = 0;
|
|
|
-
|
|
|
- at24_client = at24_translate_offset(at24, &offset);
|
|
|
- client = at24_client->client;
|
|
|
-
|
|
|
- loop_until_timeout(timeout, write_time) {
|
|
|
- status = i2c_smbus_write_byte_data(client, offset, buf[0]);
|
|
|
- if (status == 0)
|
|
|
- status = count;
|
|
|
-
|
|
|
- dev_dbg(&client->dev, "write %zu@%d --> %zd (%ld)\n",
|
|
|
- count, offset, status, jiffies);
|
|
|
-
|
|
|
- if (status == count)
|
|
|
- return count;
|
|
|
- }
|
|
|
-
|
|
|
- return -ETIMEDOUT;
|
|
|
-}
|
|
|
-
|
|
|
static ssize_t at24_regmap_write(struct at24_data *at24, const char *buf,
|
|
|
unsigned int offset, size_t count)
|
|
|
{
|
|
@@ -563,47 +503,6 @@ static ssize_t at24_regmap_write(struct at24_data *at24, const char *buf,
|
|
|
return -ETIMEDOUT;
|
|
|
}
|
|
|
|
|
|
-static ssize_t at24_eeprom_write_i2c(struct at24_data *at24, const char *buf,
|
|
|
- unsigned int offset, size_t count)
|
|
|
-{
|
|
|
- unsigned long timeout, write_time;
|
|
|
- struct at24_client *at24_client;
|
|
|
- struct i2c_client *client;
|
|
|
- struct i2c_msg msg;
|
|
|
- ssize_t status = 0;
|
|
|
- int i = 0;
|
|
|
-
|
|
|
- at24_client = at24_translate_offset(at24, &offset);
|
|
|
- client = at24_client->client;
|
|
|
- count = at24_adjust_write_count(at24, offset, count);
|
|
|
-
|
|
|
- msg.addr = client->addr;
|
|
|
- msg.flags = 0;
|
|
|
-
|
|
|
- /* msg.buf is u8 and casts will mask the values */
|
|
|
- msg.buf = at24->writebuf;
|
|
|
- if (at24->chip.flags & AT24_FLAG_ADDR16)
|
|
|
- msg.buf[i++] = offset >> 8;
|
|
|
-
|
|
|
- msg.buf[i++] = offset;
|
|
|
- memcpy(&msg.buf[i], buf, count);
|
|
|
- msg.len = i + count;
|
|
|
-
|
|
|
- loop_until_timeout(timeout, write_time) {
|
|
|
- status = i2c_transfer(client->adapter, &msg, 1);
|
|
|
- if (status == 1)
|
|
|
- status = count;
|
|
|
-
|
|
|
- dev_dbg(&client->dev, "write %zu@%d --> %zd (%ld)\n",
|
|
|
- count, offset, status, jiffies);
|
|
|
-
|
|
|
- if (status == count)
|
|
|
- return count;
|
|
|
- }
|
|
|
-
|
|
|
- return -ETIMEDOUT;
|
|
|
-}
|
|
|
-
|
|
|
static int at24_read(void *priv, unsigned int off, void *val, size_t count)
|
|
|
{
|
|
|
struct at24_data *at24 = priv;
|
|
@@ -845,7 +744,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|
|
|
|
|
mutex_init(&at24->lock);
|
|
|
at24->use_smbus = use_smbus;
|
|
|
- at24->use_smbus_write = use_smbus_write;
|
|
|
at24->chip = chip;
|
|
|
at24->num_addresses = num_addresses;
|
|
|
|
|
@@ -869,15 +767,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|
|
: at24_eeprom_read_i2c;
|
|
|
}
|
|
|
|
|
|
- if (at24->use_smbus) {
|
|
|
- if (at24->use_smbus_write == I2C_SMBUS_I2C_BLOCK_DATA)
|
|
|
- at24->write_func = at24_eeprom_write_smbus_block;
|
|
|
- else
|
|
|
- at24->write_func = at24_eeprom_write_smbus_byte;
|
|
|
- } else {
|
|
|
- at24->write_func = at24_eeprom_write_i2c;
|
|
|
- }
|
|
|
-
|
|
|
writable = !(chip.flags & AT24_FLAG_READONLY);
|
|
|
if (writable) {
|
|
|
if (!use_smbus || use_smbus_write) {
|
|
@@ -889,12 +778,6 @@ static int at24_probe(struct i2c_client *client, const struct i2c_device_id *id)
|
|
|
if (use_smbus && write_max > I2C_SMBUS_BLOCK_MAX)
|
|
|
write_max = I2C_SMBUS_BLOCK_MAX;
|
|
|
at24->write_max = write_max;
|
|
|
-
|
|
|
- /* buffer (data + address at the beginning) */
|
|
|
- at24->writebuf = devm_kzalloc(&client->dev,
|
|
|
- write_max + 2, GFP_KERNEL);
|
|
|
- if (!at24->writebuf)
|
|
|
- return -ENOMEM;
|
|
|
} else {
|
|
|
dev_warn(&client->dev,
|
|
|
"cannot write due to controller restrictions.");
|