The patch titled
Subject: drivers/rtc/rtc-ds1307.c: generalise ram size and offset
has been removed from the -mm tree. Its filename was
drivers-rtc-rtc-ds1307c-generalise-ram-size-and-offset.patch
This patch was dropped because it is obsolete
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Generalise NVRAM to support RAM with other size and offset, such as the 64
bytes of SRAM on the mcp7941x. Register offsets are added to chip
description instead of being hard-coded into probe function.
Signed-off-by: Austin Boyle <Austin.Boyle@xxxxxxxxxxxx>
Cc: Wolfram Sang <w.sang@xxxxxxxxxxxxxx>
Cc: David Anders <danders.dev@xxxxxxxxx>
Cc: Alessandro Zummo <a.zummo@xxxxxxxxxxxx>
Cc: Joakim Tjernlund <Joakim.Tjernlund@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/rtc/rtc-ds1307.c | 103 ++++++++++++++++++++++---------------
1 file changed, 62 insertions(+), 41 deletions(-)
diff -puN drivers/rtc/rtc-ds1307.c~drivers-rtc-rtc-ds1307c-generalise-ram-size-and-offset drivers/rtc/rtc-ds1307.c
--- a/drivers/rtc/rtc-ds1307.c~drivers-rtc-rtc-ds1307c-generalise-ram-size-and-offset
+++ a/drivers/rtc/rtc-ds1307.c
@@ -101,6 +101,8 @@ enum ds_type {
struct ds1307 {
u8 offset; /* register's offset */
+ u16 nvram_offset;
+ u16 nvram_size;
u8 regs[11];
enum ds_type type;
unsigned long flags;
@@ -116,34 +118,44 @@ struct ds1307 {
};
struct chip_desc {
- unsigned nvram56:1;
unsigned alarm:1;
+ u8 offset;
+ u16 nvram_offset;
+ u16 nvram_size;
};
static const struct chip_desc chips[] = {
-[ds_1307] = {
- .nvram56 = 1,
-},
-[ds_1337] = {
- .alarm = 1,
-},
-[ds_1338] = {
- .nvram56 = 1,
-},
-[ds_1339] = {
- .alarm = 1,
-},
-[ds_1340] = {
-},
-[ds_3231] = {
- .alarm = 1,
-},
-[m41t00] = {
-},
-[mcp7941x] = {
-},
-[rx_8025] = {
-}, };
+ [ds_1307] = {
+ .nvram_offset = 8,
+ .nvram_size = 56, /* 56 bytes NVRAM */
+ },
+ [ds_1337] = {
+ .alarm = 1,
+ },
+ [ds_1338] = {
+ .nvram_offset = 8,
+ .nvram_size = 56, /* 56 bytes NVRAM */
+ },
+ [ds_1339] = {
+ .alarm = 1,
+ },
+ [ds_1388] = {
+ .offset = 1, /* seconds starts at 1 */
+ },
+ [ds_1340] = {
+ },
+ [ds_3231] = {
+ .alarm = 1,
+ },
+ [m41t00] = {
+ },
+ [mcp7941x] = {
+ .nvram_offset = 0x20,
+ .nvram_size = 64, /* 64 bytes SRAM */
+ },
+ [rx_8025] = {
+ },
+};
static const struct i2c_device_id ds1307_id[] = {
{ "ds1307", ds_1307 },
@@ -541,8 +553,6 @@ static const struct rtc_class_ops ds13xx
/*----------------------------------------------------------------------*/
-#define NVRAM_SIZE 56
-
static ssize_t
ds1307_nvram_read(struct file *filp, struct kobject *kobj,
struct bin_attribute *attr,
@@ -555,14 +565,15 @@ ds1307_nvram_read(struct file *filp, str
client = kobj_to_i2c_client(kobj);
ds1307 = i2c_get_clientdata(client);
- if (unlikely(off >= NVRAM_SIZE))
+ if (unlikely(off >= ds1307->nvram_size))
return 0;
- if ((off + count) > NVRAM_SIZE)
- count = NVRAM_SIZE - off;
+ if ((off + count) > ds1307->nvram_size)
+ count = ds1307->nvram_size - off;
if (unlikely(!count))
return count;
- result = ds1307->read_block_data(client, 8 + off, count, buf);
+ result = ds1307->read_block_data(client, ds1307->nvram_offset + off,
+ count, buf);
if (result < 0)
dev_err(&client->dev, "%s error %d\n", "nvram read", result);
return result;
@@ -580,14 +591,15 @@ ds1307_nvram_write(struct file *filp, st
client = kobj_to_i2c_client(kobj);
ds1307 = i2c_get_clientdata(client);
- if (unlikely(off >= NVRAM_SIZE))
+ if (unlikely(off >= ds1307->nvram_size))
return -EFBIG;
- if ((off + count) > NVRAM_SIZE)
- count = NVRAM_SIZE - off;
+ if ((off + count) > ds1307->nvram_size)
+ count = ds1307->nvram_size - off;
if (unlikely(!count))
return count;
- result = ds1307->write_block_data(client, 8 + off, count, buf);
+ result = ds1307->write_block_data(client, ds1307->nvram_offset + off,
+ count, buf);
if (result < 0) {
dev_err(&client->dev, "%s error %d\n", "nvram write", result);
return result;
@@ -603,7 +615,6 @@ static struct bin_attribute nvram = {
.read = ds1307_nvram_read,
.write = ds1307_nvram_write,
- .size = NVRAM_SIZE,
};
/*----------------------------------------------------------------------*/
@@ -637,7 +648,19 @@ static int __devinit ds1307_probe(struct
ds1307->client = client;
ds1307->type = id->driver_data;
- ds1307->offset = 0;
+
+ if (chip && chip->offset)
+ ds1307->offset = chip->offset;
+ else
+ ds1307->offset = 0;
+ if (chip && chip->nvram_size)
+ ds1307->nvram_size = chip->nvram_size;
+ else
+ ds1307->nvram_size = 0;
+ if (chip && chip->nvram_offset)
+ ds1307->nvram_offset = chip->nvram_offset;
+ else
+ ds1307->nvram_offset = 0;
buf = ds1307->regs;
if (i2c_check_functionality(adapter, I2C_FUNC_SMBUS_I2C_BLOCK)) {
@@ -756,9 +779,6 @@ static int __devinit ds1307_probe(struct
hour);
}
break;
- case ds_1388:
- ds1307->offset = 1; /* Seconds starts at 1 */
- break;
default:
break;
}
@@ -894,11 +914,12 @@ read_rtc:
dev_dbg(&client->dev, "got IRQ %d\n", client->irq);
}
- if (chip->nvram56) {
+ if (chip && chip->nvram_size) {
+ nvram.size = ds1307->nvram_size;
err = sysfs_create_bin_file(&client->dev.kobj, &nvram);
if (err == 0) {
set_bit(HAS_NVRAM, &ds1307->flags);
- dev_info(&client->dev, "56 bytes nvram\n");
+ dev_info(&client->dev, "%zd bytes nvram\n", nvram.size);
}
}
_
Patches currently in -mm which might be from Austin.Boyle@xxxxxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
