Skip to contentSkip to conversation

ds2760 W1 slave

RFC PATCH In review Anton Vorontsov 2 participants 5 messages Apr 11, 2007 – Apr 12, 2007 W1 dallas's 1-wire bus

lore
Share & tools
lore
#0 lore raw

RFC PATCH 5/7 ds2760 W1 slave

This is W1 slave for ds2760 chip, found inside almost every HP iPaq and HTC PDAs/phones.

---
 drivers/w1/slaves/Kconfig     |   13 +++
 drivers/w1/slaves/Makefile    |    1 +
 drivers/w1/slaves/w1_ds2760.c |  162 +++++++++++++++++++++++++++++++++++++++++
 drivers/w1/slaves/w1_ds2760.h |   52 +++++++++++++
 drivers/w1/w1_family.h        |    1 +
 5 files changed, 229 insertions(+), 0 deletions(-)
 create mode 100644 drivers/w1/slaves/w1_ds2760.c
 create mode 100644 drivers/w1/slaves/w1_ds2760.h
drivers/w1/slaves/Kconfig +13 -0
index 904e5ae..df95d6c 100644
@@ -35,4 +35,17 @@ config W1_SLAVE_DS2433_CRC
 	  Each block has 30 bytes of data and a two byte CRC16.
 	  Full block writes are only allowed if the CRC is valid.
 
+config W1_SLAVE_DS2760
+	tristate "Dallas 2760 battery monitor chip (HP iPAQ & others)"
+	depends on W1
+	help
+	  If you enable this you will have the DS2760 battery monitor
+	  chip support.
+
+	  The battery monitor chip is used in many batteries/devices
+	  as the one who is responsible for charging/discharging/monitoring
+	  Li+ batteries.
+
+	  If you are unsure, say N.
+
 endmenu
drivers/w1/slaves/Makefile +1 -0
index 725dcfd..a8eb752 100644
@@ -5,4 +5,5 @@
 obj-$(CONFIG_W1_SLAVE_THERM)	+= w1_therm.o
 obj-$(CONFIG_W1_SLAVE_SMEM)	+= w1_smem.o
 obj-$(CONFIG_W1_SLAVE_DS2433)	+= w1_ds2433.o
+obj-$(CONFIG_W1_SLAVE_DS2760)	+= w1_ds2760.o
 
drivers/w1/slaves/w1_ds2760.c new file +162 -0

162 lines not on this page · raw message

drivers/w1/slaves/w1_ds2760.h new file +52 -0

52 lines not on this page · raw message

drivers/w1/w1_family.h +1 -0
index 1e2ac40..ef1e1da 100644
@@ -33,6 +33,7 @@
 #define W1_THERM_DS1822  	0x22
 #define W1_EEPROM_DS2433  	0x23
 #define W1_THERM_DS18B20 	0x28
+#define W1_FAMILY_DS2760	0x30
 
 #define MAXNAMELEN		32
 
Signature · 1 line
1.5.0.5-dirty
#1 lore raw
Quoted 2 lines · Anton Vorontsov

This is W1 slave for ds2760 chip, found inside almost every HP iPaq and HTC PDAs/phones.

Hi Anton, I have some cleanup-related comments, patch itself looks good.

Quoted 8 lines
drivers/w1/slaves/w1_ds2760.c new file +2 -0
new file mode 100644
index 0000000..21b0ef6
@@ -0,0 +1,162 @@
+/*
+ * 1-Wire implementation for the ds2760 chip

drivers/w1/slaves/w1_ds2760.c line 12

Quoted 10 lines
drivers/w1/slaves/w1_ds2760.c new file +10 -0
+ *
+ * Copyright (c) 2004-2005, Szabolcs Gyurko <[email protected]>
+ *
+ * Use consistent with the GNU GPL is permitted,
+ * provided that this copyright notice is
+ * preserved in its entirety in all copies and derived works.
+ *
+ */
+
+#include <asm/types.h>

Is it really needed?

Quoted 48 lines
drivers/w1/slaves/w1_ds2760.c new file +48 -0
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h>
+#include <linux/types.h>
+#include <linux/jiffies.h>
+
+#include "../w1.h"
+#include "../w1_int.h"
+#include "../w1_family.h"
+#include "w1_ds2760.h"
+
+static int w1_ds2760_io(struct device *dev, char *buf, int addr, size_t count,
+                        int io)
+{
+	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
+
+	if (!dev)
+		return 0;
+
+	mutex_lock(&sl->master->mutex);
+
+	if (addr > DS2760_DATA_SIZE || addr < 0) {
+		count = 0;
+		goto out;
+	}
+	if (addr + count > DS2760_DATA_SIZE)
+		count = DS2760_DATA_SIZE - addr;
+
+	if (!w1_reset_select_slave(sl)) {
+		if (!io) {
+			w1_write_8(sl->master, W1_DS2760_READ_DATA);
+			w1_write_8(sl->master, addr);
+			count = w1_read_block(sl->master, buf, count);
+		} else {
+			w1_write_8(sl->master, W1_DS2760_WRITE_DATA);
+			w1_write_8(sl->master, addr);
+			w1_write_block(sl->master, buf, count);
+			/* XXX w1_write_block returns void, not n_written */
+		}
+	}
+
+out:
+	mutex_unlock(&sl->master->mutex);
+
+	return count;
+}

drivers/w1/slaves/w1_ds2760.c line 70

Quoted 10 lines
drivers/w1/slaves/w1_ds2760.c new file +10 -0
+
+int w1_ds2760_read(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 0);
+}
+
+int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 1);
+}

Both are exported, who use them?

Quoted 20 lines
drivers/w1/slaves/w1_ds2760.c new file +20 -0
+/* io = 0 means copy from EEPROM to SRAM, 1 means from SRAM to EEPROM */
+static int w1_ds2760_eeprom(struct device *dev, int addr, int io)
+{
+	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
+	int ret = 0;
+
+	mutex_lock(&sl->master->mutex);
+
+	if (!w1_reset_select_slave(sl)) {
+		if (!io)
+		    w1_write_8(sl->master, W1_DS2760_RECALL_DATA);
+		else
+		    w1_write_8(sl->master, W1_DS2760_COPY_DATA);
+		w1_write_8(sl->master, addr);
+	}
+
+	mutex_unlock(&sl->master->mutex);
+
+	return ret;
+}

drivers/w1/slaves/w1_ds2760.c line 101

Quoted 10 lines
drivers/w1/slaves/w1_ds2760.c new file +10 -0
+
+int w1_ds2760_recall(struct device *dev, int addr)
+{
+	return w1_ds2760_eeprom(dev, addr, 0);
+}
+
+int w1_ds2760_copy(struct device *dev, int addr)
+{
+	return w1_ds2760_eeprom(dev, addr, 1);
+}

The same.

Quoted 33 lines
drivers/w1/slaves/w1_ds2760.c new file +33 -0
+static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off,
+                                  size_t count)
+{
+	struct device *dev = container_of(kobj, struct device, kobj);
+	return w1_ds2760_read(dev, buf, off, count);
+}
+
+static struct bin_attribute w1_ds2760_bin_attr = {
+	.attr = {
+		.name = "w1_slave",
+		.mode = S_IRUGO,
+		.owner = THIS_MODULE,
+	},
+	.size = DS2760_DATA_SIZE,
+	.read = w1_ds2760_read_bin,
+};
+
+static int w1_ds2760_add_slave(struct w1_slave *sl)
+{
+	return sysfs_create_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr);
+}
+
+static void w1_ds2760_remove_slave(struct w1_slave *sl)
+{
+	sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr);
+}
+
+static struct w1_family_ops w1_ds2760_fops = {
+	.add_slave    = w1_ds2760_add_slave,
+	.remove_slave = w1_ds2760_remove_slave,
+};
+
+static struct w1_family w1_ds2760_family = {

drivers/w1/slaves/w1_ds2760.c line 145

Quoted 10 lines
drivers/w1/slaves/w1_ds2760.c new file +10 -0
+	.fid = W1_FAMILY_DS2760,
+	.fops = &w1_ds2760_fops,
+};
+
+static int __init w1_ds2760_init(void)
+{
+	printk("1-Wire driver for the DS2760 battery monitor chip "
+	       " - (c) 2004-2005, Szabolcs Gyurko\n");
+	return w1_register_family(&w1_ds2760_family);
+}

Add something like KERN_INFO into printk.

Signature · 1 line
	Evgeniy Polyakov
#2 lore raw

Hello Evgeniy,

Quoted 18 lines · Evgeniy Polyakov
Quoted 2 lines · Anton Vorontsov

This is W1 slave for ds2760 chip, found inside almost every HP iPaq and HTC PDAs/phones.

Hi Anton, I have some cleanup-related comments, patch itself looks good.

Quoted 12 lines
drivers/w1/slaves/w1_ds2760.c new file +6 -0
new file mode 100644
index 0000000..21b0ef6
@@ -0,0 +1,162 @@
+/*
+ * 1-Wire implementation for the ds2760 chip
+ *
+ * Copyright (c) 2004-2005, Szabolcs Gyurko <[email protected]>
+ *
+ * Use consistent with the GNU GPL is permitted,
Quoted 8 lines

drivers/w1/slaves/w1_ds2760.c line 12

Quoted 6 lines
drivers/w1/slaves/w1_ds2760.c new file +6 -0
+ * provided that this copyright notice is
+ * preserved in its entirety in all copies and derived works.
+ *
+ */
+
+#include <asm/types.h>

Is it really needed?

No, sure.

Quoted 52 lines
Quoted 52 lines
drivers/w1/slaves/w1_ds2760.c new file +52 -0
+
+#include <linux/kernel.h>
+#include <linux/module.h>
+#include <linux/moduleparam.h>
+#include <linux/device.h>
+#include <linux/types.h>
+#include <linux/jiffies.h>
+
+#include "../w1.h"
+#include "../w1_int.h"
+#include "../w1_family.h"
+#include "w1_ds2760.h"
+
+static int w1_ds2760_io(struct device *dev, char *buf, int addr, size_t count,
+                        int io)
+{
+	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
+
+	if (!dev)
+		return 0;
+
+	mutex_lock(&sl->master->mutex);
+
+	if (addr > DS2760_DATA_SIZE || addr < 0) {
+		count = 0;
+		goto out;
+	}
+	if (addr + count > DS2760_DATA_SIZE)
+		count = DS2760_DATA_SIZE - addr;
+
+	if (!w1_reset_select_slave(sl)) {
+		if (!io) {
+			w1_write_8(sl->master, W1_DS2760_READ_DATA);
+			w1_write_8(sl->master, addr);
+			count = w1_read_block(sl->master, buf, count);
+		} else {
+			w1_write_8(sl->master, W1_DS2760_WRITE_DATA);
+			w1_write_8(sl->master, addr);
+			w1_write_block(sl->master, buf, count);
+			/* XXX w1_write_block returns void, not n_written */
+		}
+	}
+
+out:
+	mutex_unlock(&sl->master->mutex);
+
+	return count;
+}
+
+int w1_ds2760_read(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 0);
Quoted 8 lines

drivers/w1/slaves/w1_ds2760.c line 70

Quoted 6 lines
drivers/w1/slaves/w1_ds2760.c new file +6 -0
+}
+
+int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 1);
+}

Both are exported, who use them?

ds2760_battery driver. W1 does not have any API to "talk" to w1 slaves in generic manner (at least I didn't found any).
So, ds2760_battery using it.

static int ds2760_battery_read_status(struct ds2760_device_info *di) {
[...]

        ret = w1_ds2760_read(di->w1_dev, di->raw + start, start, count);
        if (ret != count) {
                printk("call to w1_ds2760_read failed (0x%08x)\n",
                       (unsigned int)di->w1_dev);
                return 1;
        }

static void ds2760_battery_update_status(struct ds2760_device_info *di) {
[...]

                                acr[0] = (di->full_active_mAh * 4) >> 8;
                                acr[1] = (di->full_active_mAh * 4) & 0xff;

                                if (w1_ds2760_write(di->w1_dev, acr,
                                    DS2760_CURRENT_ACCUM_MSB, 2) < 2)
                                        printk(KERN_ERR "ACR reset failed\n");
                                di->charge_status = BATTERY_STATUS_FULL;

[...]

Quoted 24 lines
Quoted 24 lines
drivers/w1/slaves/w1_ds2760.c new file +24 -0
+/* io = 0 means copy from EEPROM to SRAM, 1 means from SRAM to EEPROM */
+static int w1_ds2760_eeprom(struct device *dev, int addr, int io)
+{
+	struct w1_slave *sl = container_of(dev, struct w1_slave, dev);
+	int ret = 0;
+
+	mutex_lock(&sl->master->mutex);
+
+	if (!w1_reset_select_slave(sl)) {
+		if (!io)
+		    w1_write_8(sl->master, W1_DS2760_RECALL_DATA);
+		else
+		    w1_write_8(sl->master, W1_DS2760_COPY_DATA);
+		w1_write_8(sl->master, addr);
+	}
+
+	mutex_unlock(&sl->master->mutex);
+
+	return ret;
+}
+
+int w1_ds2760_recall(struct device *dev, int addr)
+{
+	return w1_ds2760_eeprom(dev, addr, 0);
Quoted 8 lines

drivers/w1/slaves/w1_ds2760.c line 101

Quoted 6 lines
drivers/w1/slaves/w1_ds2760.c new file +6 -0
+}
+
+int w1_ds2760_copy(struct device *dev, int addr)
+{
+	return w1_ds2760_eeprom(dev, addr, 1);
+}

The same.

Yeah, these two should be static, right.

Quoted 37 lines
Quoted 37 lines
drivers/w1/slaves/w1_ds2760.c new file +37 -0
+static ssize_t w1_ds2760_read_bin(struct kobject *kobj, char *buf, loff_t off,
+                                  size_t count)
+{
+	struct device *dev = container_of(kobj, struct device, kobj);
+	return w1_ds2760_read(dev, buf, off, count);
+}
+
+static struct bin_attribute w1_ds2760_bin_attr = {
+	.attr = {
+		.name = "w1_slave",
+		.mode = S_IRUGO,
+		.owner = THIS_MODULE,
+	},
+	.size = DS2760_DATA_SIZE,
+	.read = w1_ds2760_read_bin,
+};
+
+static int w1_ds2760_add_slave(struct w1_slave *sl)
+{
+	return sysfs_create_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr);
+}
+
+static void w1_ds2760_remove_slave(struct w1_slave *sl)
+{
+	sysfs_remove_bin_file(&sl->dev.kobj, &w1_ds2760_bin_attr);
+}
+
+static struct w1_family_ops w1_ds2760_fops = {
+	.add_slave    = w1_ds2760_add_slave,
+	.remove_slave = w1_ds2760_remove_slave,
+};
+
+static struct w1_family w1_ds2760_family = {
+	.fid = W1_FAMILY_DS2760,
+	.fops = &w1_ds2760_fops,
+};
+
Quoted 8 lines

drivers/w1/slaves/w1_ds2760.c line 145

Quoted 6 lines
drivers/w1/slaves/w1_ds2760.c new file +6 -0
+static int __init w1_ds2760_init(void)
+{
+	printk("1-Wire driver for the DS2760 battery monitor chip "
+	       " - (c) 2004-2005, Szabolcs Gyurko\n");
+	return w1_register_family(&w1_ds2760_family);
+}

Add something like KERN_INFO into printk.

Will do.

Quoted 2 lines
Signature · 1 line
	Evgeniy Polyakov

Thanks!

Signature · 4 lines
Anton Vorontsov
email: [email protected]
backup email: [email protected]
irc://irc.freenode.org/bd2
#3 lore raw
Quoted 12 lines · Anton Vorontsov
Quoted 11 lines

drivers/w1/slaves/w1_ds2760.c line 70

Quoted 9 lines
drivers/w1/slaves/w1_ds2760.c new file +9 -0
+int w1_ds2760_read(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 0);
+}
+
+int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 1);
+}

Both are exported, who use them?

Quoted 3 lines

ds2760_battery driver. W1 does not have any API to "talk" to w1 slaves in generic manner (at least I didn't found any).
So, ds2760_battery using it.

It was - bus masters were accessed through generic find_bus() via device/driver model, bus master has links to all devices found on controlled bus.
But find_bus() was removed, so there is no such mechanism right now.

I have no objections against this driver, feel free to add my ack (when trivialities described are resolved) or I can push w1 part myself.

Signature · 1 line
	Evgeniy Polyakov
#4 lore raw
Quoted 17 lines · Evgeniy Polyakov
Quoted 12 lines · Anton Vorontsov
Quoted 11 lines

Review

Quoted 9 lines
(quoted diff) +9 -0
+int w1_ds2760_read(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 0);
+}
+
+int w1_ds2760_write(struct device *dev, char *buf, int addr, size_t count)
+{
+	return w1_ds2760_io(dev, buf, addr, count, 1);
+}

Both are exported, who use them?

Quoted 3 lines

ds2760_battery driver. W1 does not have any API to "talk" to w1 slaves in generic manner (at least I didn't found any).
So, ds2760_battery using it.

Quoted 7 lines

It was - bus masters were accessed through generic find_bus() via device/driver model, bus master has links to all devices found on controlled bus.
But find_bus() was removed, so there is no such mechanism right now.

I have no objections against this driver, feel free to add my ack (when trivialities described are resolved) or I can push w1 part myself.

Cleaned up patch follows. Before acking, please take a look at "#if 0", I don't know if it's okay for you.

Quoted 2 lines
Signature · 1 line
	Evgeniy Polyakov

Thanks,

From: Anton Vorontsov <[email protected]>
Subject: [PATCH] [RFC] ds2760 W1 slave

This is W1 slave for ds2760 chip, found inside almost every HP iPaq and HTC PDAs/phones.

---
 drivers/w1/slaves/Kconfig     |   13 +++
 drivers/w1/slaves/Makefile    |    1 +
 drivers/w1/slaves/w1_ds2760.c |  162 +++++++++++++++++++++++++++++++++++++++++
 drivers/w1/slaves/w1_ds2760.h |   50 +++++++++++++
 drivers/w1/w1_family.h        |    1 +
 5 files changed, 227 insertions(+), 0 deletions(-)
 create mode 100644 drivers/w1/slaves/w1_ds2760.c
 create mode 100644 drivers/w1/slaves/w1_ds2760.h
drivers/w1/slaves/Kconfig +13 -0
index 904e5ae..df95d6c 100644
@@ -35,4 +35,17 @@ config W1_SLAVE_DS2433_CRC
 	  Each block has 30 bytes of data and a two byte CRC16.
 	  Full block writes are only allowed if the CRC is valid.
 
+config W1_SLAVE_DS2760
+	tristate "Dallas 2760 battery monitor chip (HP iPAQ & others)"
+	depends on W1
+	help
+	  If you enable this you will have the DS2760 battery monitor
+	  chip support.
+
+	  The battery monitor chip is used in many batteries/devices
+	  as the one who is responsible for charging/discharging/monitoring
+	  Li+ batteries.
+
+	  If you are unsure, say N.
+
 endmenu
drivers/w1/slaves/Makefile +1 -0
index 725dcfd..a8eb752 100644
@@ -5,4 +5,5 @@
 obj-$(CONFIG_W1_SLAVE_THERM)	+= w1_therm.o
 obj-$(CONFIG_W1_SLAVE_SMEM)	+= w1_smem.o
 obj-$(CONFIG_W1_SLAVE_DS2433)	+= w1_ds2433.o
+obj-$(CONFIG_W1_SLAVE_DS2760)	+= w1_ds2760.o
 
drivers/w1/slaves/w1_ds2760.c new file +162 -0

162 lines not on this page · raw message

drivers/w1/slaves/w1_ds2760.h new file +50 -0

50 lines not on this page · raw message

drivers/w1/w1_family.h +1 -0
index 1e2ac40..ef1e1da 100644
@@ -33,6 +33,7 @@
 #define W1_THERM_DS1822  	0x22
 #define W1_EEPROM_DS2433  	0x23
 #define W1_THERM_DS18B20 	0x28
+#define W1_FAMILY_DS2760	0x30
 
 #define MAXNAMELEN		32
 
Signature · 1 line
1.5.0.5-dirty