Skip to contentSkip to conversation

Support for DS620

PATCH Applied Roland Stigge 3 participants 22 messages Dec 20, 2010 – Jan 9, 2011

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Support for DS620

Hi,

I'm attaching a patch with support for the temperature sensor DS620 (ds620.c). It is based on ds1621.c but the device is sufficiently different to warrant a separate driver. E.g., configuration registers is different and includes 16bit values instead of 8bit.

Thanks for considering.

bye,
Roland

drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +343 -0

343 lines not on this page · raw message

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#1 lore raw
Quoted 11 lines · Roland Stigge

Hi,

I'm attaching a patch with support for the temperature sensor DS620 (ds620.c). It is based on ds1621.c but the device is sufficiently different to warrant a separate driver. E.g., configuration registers is different and includes 16bit values instead of 8bit.

Thanks for considering.

bye,
Roland

Please run your patch through scripts/checkpatch.pl and ensure it reports no errors or warnings. Also please provide Documentation/hwmon/ds620.

Thanks,
Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#2 lore raw
In reply to Roland Stigge

Hi,

Quoted 2 lines · Guenter Roeck

Please run your patch through scripts/checkpatch.pl and ensure it reports no errors or warnings. Also please provide Documentation/hwmon/ds620.

Thanks for the hint!

I revised the patch and included Documentation/hwmon/ds620. See attachment.

bye,
Roland

Documentation/hwmon/ds620 new file +24 -0
new file mode 100644
index 0000000..ba4c6bc
@@ -0,0 +1,24 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +357 -0

357 lines not on this page · raw message

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#3 lore raw
In reply to Roland Stigge
Quoted 6 lines · Roland Stigge

Hi,

Quoted 2 lines · Guenter Roeck

Please run your patch through scripts/checkpatch.pl and ensure it reports no errors or warnings. Also please provide Documentation/hwmon/ds620.

Quoted 8 lines

Thanks for the hint!

I revised the patch and included Documentation/hwmon/ds620. See attachment.

bye,
Roland

Did you apply your patch ? All the above will show up in the patch log, which isn't really a good idea. Also, you still have a whitespace error (blank line at end of the Documentation/hwmon/ds620).

Formatting isn't always consistent, mostly where you replaced ds1620 with ds620. Best might be to run ds620.c through scripts/Lindent and do a little post-cleanup (Lindent tends to screw up static initializations for some reason).

Couple of other comments inline.

Quoted 200 lines
Documentation/hwmon/ds620 new file +23 -0
new file mode 100644
index 0000000..ba4c6bc
@@ -0,0 +1,24 @@
+Kernel driver ds620
+=========> +
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +132 -0
new file mode 100644
index 0000000..2fbd193
@@ -0,0 +1,357 @@
+/*
+    ds620.c - Support for temperature sensor and thermostat DS620
+
+    Copyright (C) 2010 Roland Stigge <[email protected]>
+
+    based on ds1621.c by Christian W. Zuckschwerdt  <[email protected]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+
+/* Addresses to scan */
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+					0x4d, 0x4e, 0x4f, I2C_CLIENT_END };
+
+/* Many DS620 constants specified below */
+/* Config register used for detection          */
+/*  15   14   13   12   11   10   09    08     */
+/* |Done|NVB |THF |TLF |R1  |R0  |AUTOC|1SHOT| */
+
+/*  07   06   05   04   03   02   01    00     */
+/* |PO2 |PO1 |A2  |A1  |A0  |    |     |     | */
+#define DS620_REG_CONFIG_DONE		0x8000
+#define DS620_REG_CONFIG_NVB		0x4000
+#define DS620_REG_CONFIG_THF		0x2000
+#define DS620_REG_CONFIG_TLF		0x1000
+#define DS620_REG_CONFIG_R1		0x0800
+#define DS620_REG_CONFIG_R0		0x0400
+#define DS620_REG_CONFIG_AUTOC          0x0200
+#define DS620_REG_CONFIG_1SHOT		0x0100
+#define DS620_REG_CONFIG_PO2		0x0080
+#define DS620_REG_CONFIG_PO1		0x0040
+#define DS620_REG_CONFIG_A2		0x0020
+#define DS620_REG_CONFIG_A1		0x0010
+#define DS620_REG_CONFIG_A0		0x0008
+
+/* The DS620 registers */
+static const u8 DS620_REG_TEMP[3] = {
+	0xAA,		/* input, word, RO */
+	0xA2,		/* min, word, RW */
+	0xA0,		/* max, word, RW */
+};
+#define DS620_REG_CONF		0xAC /* word, RW */
+#define DS620_COM_START		0x51 /* no data */
+#define DS620_COM_STOP		0x22 /* no data */
+
+/* Conversions */
+#define ALARMS_FROM_REG(val) ((val) & \
+				(DS620_REG_CONFIG_THF | DS620_REG_CONFIG_TLF))
+
+/* Each client has this additional data */
+struct ds620_data {
+	struct device *hwmon_dev;
+	struct mutex update_lock;
+	char valid;			/* !=0 if following fields are valid */
+	unsigned long last_updated;	/* In jiffies */
+
+	u16 temp[3];			/* Register values, word */
+	u16 conf;			/* Register encoding, combined */
+};
+
+/* Temperature registers are word-sized.
+   DS620 uses a high-byte first convention, which is exactly opposite to
+   the SMBus standard. */
+static int ds620_read_temp(struct i2c_client *client, u8 reg)
+{
+	int ret;
+
+	ret = i2c_smbus_read_word_data(client, reg);
+	if (ret < 0)
+		return ret;
+	return swab16(ret);
+}
+
+static int ds620_write_temp(struct i2c_client *client, u8 reg, u16 value)
+{
+	return i2c_smbus_write_word_data(client, reg, swab16(value));
+}
+
+static void ds620_init_client(struct i2c_client *client)
+{
+	u16 conf, new_conf;
+
+	new_conf = conf > +		swab16(i2c_smbus_read_word_data(client, DS620_REG_CONF));
+
+	/* switch to continuous conversion mode */
+	new_conf &= ~DS620_REG_CONFIG_1SHOT;
+	/* with highest precision */
+	new_conf |= DS620_REG_CONFIG_R1 | DS620_REG_CONFIG_R0;
+
+	if (conf != new_conf) {
+		i2c_smbus_write_word_data(
+				client, DS620_REG_CONF, swab16(new_conf));
+	}
+
+	/* start conversion */
+	i2c_smbus_write_byte(client, DS620_COM_START);
+}
+
+static struct ds620_data *ds620_update_client(struct device *dev)
+{
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+	u16 new_conf;
+
+	mutex_lock(&data->update_lock);
+
+	if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+	    || !data->valid) {
+		int i;

drivers/hwmon/ds620.c line 142

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+
+		dev_dbg(&client->dev, "Starting ds620 update\n");
+
+		data->conf = swab16(i2c_smbus_read_word_data(client,
+							     DS620_REG_CONF));
+
+		for (i = 0; i < ARRAY_SIZE(data->temp); i++)
+			data->temp[i] = ds620_read_temp(client,
+							 DS620_REG_TEMP[i]);
+

I know this is code matches exactly the ds1621 code. Yet, it ignores errors returned by ds620_read_temp() and i2c_smbus_read_word_data(), so it is not really clean. Worth thinking about a fix. One possible solution might be to keep conf and temp[i] as int and return its value as error if it is below 0. Another solution would be to return the error from ds620_update_client() using ERR_PTR() and handle the condition in the calling code; see drivers/hwmon/ltc4261.c for an example.

drivers/hwmon/ds620.c line 148

Quoted 9 lines
drivers/hwmon/ds620.c new file +9 -0
+		/* reset alarms if necessary */
+		new_conf = data->conf;
+		if (data->temp[0] > data->temp[1])	/* input > min */
+			new_conf &= ~DS620_REG_CONFIG_TLF;
+		if (data->temp[0] < data->temp[2])	/* input < max */
+			new_conf &= ~DS620_REG_CONFIG_THF;
+		if (data->conf != new_conf)
+			i2c_smbus_write_word_data(client, DS620_REG_CONF,
+						  swab16(new_conf));

This code resets alarms even if those are not shown to the user. The idea is for the alarms to be reset only after the matching alarm has been shown. So the above code should be moved to the show_alarm().

Quoted 21 lines
drivers/hwmon/ds620.c new file +16 -0
+
+		data->last_updated = jiffies;
+		data->valid = 1;
+	}
+
+	mutex_unlock(&data->update_lock);
+
+	return data;
+}
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+			 char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct ds620_data *data = ds620_update_client(dev);
+	return sprintf(buf, "%d\n",
			((data->temp[attr->index] / 8) * 625) / 10);
drivers/hwmon/ds620.c new file +4 -0
+}
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)

drivers/hwmon/ds620.c line 206

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+{
+	int res;
+	long val;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	res = strict_strtol(buf, 10, &val);
+

Should be

	if (res)
		return res;

	val = (val * 10 / 625) * 8;
	...
Quoted 9 lines
drivers/hwmon/ds620.c new file +9 -0
+	if (!res) {
+		val = (val * 10 / 625) * 8;
+
+		mutex_lock(&data->update_lock);
+		data->temp[attr->index] = val;
+		ds620_write_temp(client, DS620_REG_TEMP[attr->index],
+				  data->temp[attr->index]);
+		mutex_unlock(&data->update_lock);
+	}

drivers/hwmon/ds620.c line 197

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+	return count;
+}
+
+static ssize_t show_alarms(struct device *dev, struct device_attribute *da,
+			   char *buf)
+{
+	struct ds620_data *data = ds620_update_client(dev);
+	return sprintf(buf, "%d\n", ALARMS_FROM_REG(data->conf));
+}
+

_alarms is deprecated. Please remove.

Quoted 22 lines
drivers/hwmon/ds620.c new file +22 -0
+static ssize_t show_alarm(struct device *dev, struct device_attribute *da,
+			  char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct ds620_data *data = ds620_update_client(dev);
+	return sprintf(buf, "%d\n", !!(data->conf & attr->index));
+}
+
+static DEVICE_ATTR(alarms, S_IRUGO, show_alarms, NULL);
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp, 1);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp, 2);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL,
+		DS620_REG_CONFIG_TLF);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL,
+		DS620_REG_CONFIG_THF);
+
+static struct attribute *ds620_attributes[] = {
+	&sensor_dev_attr_temp1_input.dev_attr.attr,
+	&sensor_dev_attr_temp1_min.dev_attr.attr,
+	&sensor_dev_attr_temp1_max.dev_attr.attr,
+	&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,

drivers/hwmon/ds620.c line 221

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+	&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+	&dev_attr_alarms.attr,
+	NULL
+};
+
+static const struct attribute_group ds620_group = {
+	.attrs = ds620_attributes,
+};
+
+

Extra blank line (Lindent would take care of that).

Quoted 113 lines
drivers/hwmon/ds620.c new file +113 -0
+/* Return 0 if detection is successful, -ENODEV otherwise */
+static int ds620_detect(struct i2c_client *client,
+			 struct i2c_board_info *info)
+{
+	struct i2c_adapter *adapter = client->adapter;
+	int result, conf, temp;
+	int i;
+
+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
+				     | I2C_FUNC_SMBUS_WORD_DATA
+				     | I2C_FUNC_SMBUS_WRITE_BYTE))
+		return -ENODEV;
+
+	/* Now, we do the remaining detection. */
+	result = i2c_smbus_read_word_data(client, DS620_REG_CONF);
+	conf = swab16(result);
+	if (result < 0 || conf & DS620_REG_CONFIG_NVB ||
+			((conf & DS620_REG_CONFIG_DONE) &&
+			 (conf & DS620_REG_CONFIG_AUTOC)) ||
+			!((conf & DS620_REG_CONFIG_DONE) &&
+			!(conf & DS620_REG_CONFIG_AUTOC)))
+		return -ENODEV;
+	/* The 3 lowest bits of a temperature should always be 0. */
+	for (i = 0; i < ARRAY_SIZE(DS620_REG_TEMP); i++) {
+		temp = i2c_smbus_read_word_data(client, DS620_REG_TEMP[i]);
+		if (temp < 0 || (temp & 0x0700))
+			return -ENODEV;
+	}
+
+	strlcpy(info->type, "ds620", I2C_NAME_SIZE);
+
+	return 0;
+}
+
+static int ds620_probe(struct i2c_client *client,
+			const struct i2c_device_id *id)
+{
+	struct ds620_data *data;
+	int err;
+
+	data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL);
+	if (!data) {
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->update_lock);
+
+	/* Initialize the DS620 chip */
+	ds620_init_client(client);
+
+	/* Register sysfs hooks */
+	err = sysfs_create_group(&client->dev.kobj, &ds620_group);
+	if (err)
+		goto exit_free;
+
+	data->hwmon_dev = hwmon_device_register(&client->dev);
+	if (IS_ERR(data->hwmon_dev)) {
+		err = PTR_ERR(data->hwmon_dev);
+		goto exit_remove_files;
+	}
+
+	dev_info(&client->dev, "temperature sensor found\n");
+
+	return 0;
+
+exit_remove_files:
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+exit_free:
+	kfree(data);
+exit:
+	return err;
+}
+
+static int ds620_remove(struct i2c_client *client)
+{
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	hwmon_device_unregister(data->hwmon_dev);
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+
+	kfree(data);
+
+	return 0;
+}
+
+static const struct i2c_device_id ds620_id[] = {
+	{ "ds620", 0 },
+	{ }
+};
+MODULE_DEVICE_TABLE(i2c, ds620_id);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver ds620_driver = {
+	.class		= I2C_CLASS_HWMON,
+	.driver = {
+		.name	= "ds620",
+	},
+	.probe		= ds620_probe,
+	.remove		= ds620_remove,
+	.id_table	= ds620_id,
+	.detect		= ds620_detect,
+	.address_list	= normal_i2c,
+};
+
+static int __init ds620_init(void)
+{
+	return i2c_add_driver(&ds620_driver);
+}
+
+static void __exit ds620_exit(void)
+{

drivers/hwmon/ds620.c line 343

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+	i2c_del_driver(&ds620_driver);
+}
+
+
+MODULE_AUTHOR("Roland Stigge <[email protected]>");
+MODULE_DESCRIPTION("DS620 driver");
+MODULE_LICENSE("GPL");
+
+module_init(ds620_init);
+module_exit(ds620_exit);

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#4 lore raw
In reply to Roland Stigge

Hi!

Thanks for your advice!

Quoted 4 lines · Guenter Roeck
Quoted 1 line

Did you apply your patch ? All the above will show up in the patch log, which isn't really a good idea.

Please only consider the attached patch file (including the one line description plus the "Signed-off-by:" line.

I included all your suggestions and attached the new patch.

Thanks for considering!

bye,
Roland

Added support for Dallas Semiconductor DS620

Documentation/hwmon/ds620 new file +23 -0
new file mode 100644
index 0000000..824d01d
@@ -0,0 +1,23 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +362 -0

362 lines not on this page · raw message

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#5 lore raw
In reply to Roland Stigge
Quoted 15 lines · Roland Stigge

Hi!

Thanks for your advice!

Quoted 4 lines · Guenter Roeck
Quoted 1 line

Did you apply your patch ? All the above will show up in the patch log, which isn't really a good idea.

Please only consider the attached patch file (including the one line description plus the "Signed-off-by:" line.

I included all your suggestions and attached the new patch.

Quoted 9 lines

Thanks for considering!

bye,
Roland

Added support for Dallas Semiconductor DS620

Almost there. See below.

Guenter

Quoted 109 lines
Documentation/hwmon/ds620 new file +22 -0
new file mode 100644
index 0000000..824d01d
@@ -0,0 +1,23 @@
+Kernel driver ds620
+=========> +
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +42 -0
new file mode 100644
index 0000000..1025f74
@@ -0,0 +1,362 @@
+/*
+    ds620.c - Support for temperature sensor and thermostat DS620
+
+    Copyright (C) 2010 Roland Stigge <[email protected]>
+
+    based on ds1621.c by Christian W. Zuckschwerdt  <[email protected]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+
+/* Addresses to scan */
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+					0x4d, 0x4e, 0x4f, I2C_CLIENT_END
+};
+
+/* Many DS620 constants specified below */
+/* Config register used for detection          */
+/*  15   14   13   12   11   10   09    08     */
+/* |Done|NVB |THF |TLF |R1  |R0  |AUTOC|1SHOT| */

drivers/hwmon/ds620.c line 52

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+
+/*  07   06   05   04   03   02   01    00     */
+/* |PO2 |PO1 |A2  |A1  |A0  |    |     |     | */
+#define DS620_REG_CONFIG_DONE		0x8000
+#define DS620_REG_CONFIG_NVB		0x4000
+#define DS620_REG_CONFIG_THF		0x2000
+#define DS620_REG_CONFIG_TLF		0x1000
+#define DS620_REG_CONFIG_R1		0x0800
+#define DS620_REG_CONFIG_R0		0x0400
+#define DS620_REG_CONFIG_AUTOC          0x0200

Some blanks got in here. Odd - I thought checkpatch would complain about that.

Quoted 81 lines
drivers/hwmon/ds620.c new file +81 -0
+#define DS620_REG_CONFIG_1SHOT		0x0100
+#define DS620_REG_CONFIG_PO2		0x0080
+#define DS620_REG_CONFIG_PO1		0x0040
+#define DS620_REG_CONFIG_A2		0x0020
+#define DS620_REG_CONFIG_A1		0x0010
+#define DS620_REG_CONFIG_A0		0x0008
+
+/* The DS620 registers */
+static const u8 DS620_REG_TEMP[3] = {
+	0xAA,			/* input, word, RO */
+	0xA2,			/* min, word, RW */
+	0xA0,			/* max, word, RW */
+};
+
+#define DS620_REG_CONF		0xAC	/* word, RW */
+#define DS620_COM_START		0x51	/* no data */
+#define DS620_COM_STOP		0x22	/* no data */
+
+/* Conversions */
+#define ALARMS_FROM_REG(val) ((val) & \
+				(DS620_REG_CONFIG_THF | DS620_REG_CONFIG_TLF))
+
+/* Each client has this additional data */
+struct ds620_data {
+	struct device *hwmon_dev;
+	struct mutex update_lock;
+	char valid;		/* !=0 if following fields are valid */
+	unsigned long last_updated;	/* In jiffies */
+
+	u16 temp[3];		/* Register values, word */
+	u16 conf;		/* Register encoding, combined */
+};
+
+/* Temperature registers are word-sized.
+   DS620 uses a high-byte first convention, which is exactly opposite to
+   the SMBus standard. */
+static int ds620_read_temp(struct i2c_client *client, u8 reg)
+{
+	int ret;
+
+	ret = i2c_smbus_read_word_data(client, reg);
+	if (ret < 0)
+		return ret;
+	return swab16(ret);
+}
+
+static int ds620_write_temp(struct i2c_client *client, u8 reg, u16 value)
+{
+	return i2c_smbus_write_word_data(client, reg, swab16(value));
+}
+
+static void ds620_init_client(struct i2c_client *client)
+{
+	u16 conf, new_conf;
+
+	new_conf = conf > +	    swab16(i2c_smbus_read_word_data(client, DS620_REG_CONF));
+
+	/* switch to continuous conversion mode */
+	new_conf &= ~DS620_REG_CONFIG_1SHOT;
+	/* with highest precision */
+	new_conf |= DS620_REG_CONFIG_R1 | DS620_REG_CONFIG_R0;
+
+	if (conf != new_conf) {
+		i2c_smbus_write_word_data(client, DS620_REG_CONF,
+					  swab16(new_conf));
+	}
+
+	/* start conversion */
+	i2c_smbus_write_byte(client, DS620_COM_START);
+}
+
+static struct ds620_data *ds620_update_client(struct device *dev)
+{
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	mutex_lock(&data->update_lock);
+
+	if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+	    || !data->valid) {
+		int i;

drivers/hwmon/ds620.c line 143

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+		int res;
+
+		dev_dbg(&client->dev, "Starting ds620 update\n");
+
+		for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
+			res = ds620_read_temp(client,
+					      DS620_REG_TEMP[i]);
+			if (res < 0)
+				return ERR_PTR(res);
+

Mutex is still locked here. Look at how I implemented this in ltc4261.c.

Quoted 53 lines
drivers/hwmon/ds620.c new file +53 -0
+			data->temp[i] = res;
+		}
+
+		data->last_updated = jiffies;
+		data->valid = 1;
+	}
+
+	mutex_unlock(&data->update_lock);
+
+	return data;
+}
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+			 char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct ds620_data *data = ds620_update_client(dev);
+
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	return sprintf(buf, "%d\n", ((data->temp[attr->index] / 8) * 625) / 10);
+}
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{
+	int res;
+	long val;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	res = strict_strtol(buf, 10, &val);
+
+	if (res)
+		return res;
+
+	val = (val * 10 / 625) * 8;
+
+	mutex_lock(&data->update_lock);
+	data->temp[attr->index] = val;
+	ds620_write_temp(client, DS620_REG_TEMP[attr->index],
+			 data->temp[attr->index]);
+	mutex_unlock(&data->update_lock);
+	return count;
+}
+
+static ssize_t show_alarm(struct device *dev, struct device_attribute *da,
+			  char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);

drivers/hwmon/ds620.c

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+	struct ds620_data *data = ds620_update_client(dev);
+	struct i2c_client *client = to_i2c_client(dev);
+	u16 new_conf;
+
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	/* reset alarms if necessary */
+	data->conf = swab16(i2c_smbus_read_word_data(client,
+						     DS620_REG_CONF));

You might want to check the error code from i2c_smbus_read_word_data() as well.

Quoted 145 lines
drivers/hwmon/ds620.c new file +145 -0
+	new_conf = data->conf;
+	if (data->temp[0] > data->temp[1])	/* input > min */
+		new_conf &= ~DS620_REG_CONFIG_TLF;
+	if (data->temp[0] < data->temp[2])	/* input < max */
+		new_conf &= ~DS620_REG_CONFIG_THF;
+	if (data->conf != new_conf)
+		i2c_smbus_write_word_data(client, DS620_REG_CONF,
+					  swab16(new_conf));
+
+	return sprintf(buf, "%d\n", !!(data->conf & attr->index));
+}
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp, 1);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp, 2);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL,
+			  DS620_REG_CONFIG_TLF);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL,
+			  DS620_REG_CONFIG_THF);
+
+static struct attribute *ds620_attributes[] = {
+	&sensor_dev_attr_temp1_input.dev_attr.attr,
+	&sensor_dev_attr_temp1_min.dev_attr.attr,
+	&sensor_dev_attr_temp1_max.dev_attr.attr,
+	&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group ds620_group = {
+	.attrs = ds620_attributes,
+};
+
+/* Return 0 if detection is successful, -ENODEV otherwise */
+static int ds620_detect(struct i2c_client *client, struct i2c_board_info *info)
+{
+	struct i2c_adapter *adapter = client->adapter;
+	int result, conf, temp;
+	int i;
+
+	if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
+				     | I2C_FUNC_SMBUS_WORD_DATA
+				     | I2C_FUNC_SMBUS_WRITE_BYTE))
+		return -ENODEV;
+
+	/* Now, we do the remaining detection. */
+	result = i2c_smbus_read_word_data(client, DS620_REG_CONF);
+	conf = swab16(result);
+	if (result < 0 || conf & DS620_REG_CONFIG_NVB ||
+	    ((conf & DS620_REG_CONFIG_DONE) &&
+	     (conf & DS620_REG_CONFIG_AUTOC)) ||
+	    !((conf & DS620_REG_CONFIG_DONE) &&
+	      !(conf & DS620_REG_CONFIG_AUTOC)))
+		return -ENODEV;
+	/* The 3 lowest bits of a temperature should always be 0. */
+	for (i = 0; i < ARRAY_SIZE(DS620_REG_TEMP); i++) {
+		temp = i2c_smbus_read_word_data(client, DS620_REG_TEMP[i]);
+		if (temp < 0 || (temp & 0x0700))
+			return -ENODEV;
+	}
+
+	strlcpy(info->type, "ds620", I2C_NAME_SIZE);
+
+	return 0;
+}
+
+static int ds620_probe(struct i2c_client *client,
+		       const struct i2c_device_id *id)
+{
+	struct ds620_data *data;
+	int err;
+
+	data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL);
+	if (!data) {
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->update_lock);
+
+	/* Initialize the DS620 chip */
+	ds620_init_client(client);
+
+	/* Register sysfs hooks */
+	err = sysfs_create_group(&client->dev.kobj, &ds620_group);
+	if (err)
+		goto exit_free;
+
+	data->hwmon_dev = hwmon_device_register(&client->dev);
+	if (IS_ERR(data->hwmon_dev)) {
+		err = PTR_ERR(data->hwmon_dev);
+		goto exit_remove_files;
+	}
+
+	dev_info(&client->dev, "temperature sensor found\n");
+
+	return 0;
+
+exit_remove_files:
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+exit_free:
+	kfree(data);
+exit:
+	return err;
+}
+
+static int ds620_remove(struct i2c_client *client)
+{
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	hwmon_device_unregister(data->hwmon_dev);
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+
+	kfree(data);
+
+	return 0;
+}
+
+static const struct i2c_device_id ds620_id[] = {
+	{"ds620", 0},
+	{}
+};
+
+MODULE_DEVICE_TABLE(i2c, ds620_id);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver ds620_driver = {
+	.class = I2C_CLASS_HWMON,
+	.driver = {
+		   .name = "ds620",
+	},
+	.probe = ds620_probe,
+	.remove = ds620_remove,
+	.id_table = ds620_id,
+	.detect = ds620_detect,
+	.address_list = normal_i2c,
+};
+
+static int __init ds620_init(void)
+{
+	return i2c_add_driver(&ds620_driver);
+}
+
+static void __exit ds620_exit(void)

drivers/hwmon/ds620.c line 343

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+{
+	i2c_del_driver(&ds620_driver);
+}
+
+MODULE_AUTHOR("Roland Stigge <[email protected]>");
+MODULE_DESCRIPTION("DS620 driver");
+MODULE_LICENSE("GPL");
+
+module_init(ds620_init);
+module_exit(ds620_exit);

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#6 lore raw
In reply to Roland Stigge

Hi,

thanks again for your valuable feedback!

Attaching the updated patch including your proposed changes.

bye,
Roland

Added support for Dallas Semiconductor DS620

Documentation/hwmon/ds620 new file +23 -0
new file mode 100644
index 0000000..824d01d
@@ -0,0 +1,23 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +372 -0

372 lines not on this page · raw message

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#7 lore raw
In reply to Roland Stigge
Quoted 4 lines · Roland Stigge

Hi,

thanks again for your valuable feedback!

Quoted 9 lines

Attaching the updated patch including your proposed changes.

bye,
Roland

Added support for Dallas Semiconductor DS620

Queued for -next.

Thanks,
Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#8 lore raw
In reply to Roland Stigge
Quoted 5 lines · Guenter Roeck
Quoted 4 lines

Added support for Dallas Semiconductor DS620

Queued for -next.

Thanks in advance!

Another question: I will need to write a driver for the MAX518 DAC. What is the appropriate place?

* hwmon (well, it is an analog _output_, not a monioring input)
* gpio (it is an analog, not _digital_ 0/1 output)
* misc

?

bye,
Roland

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#9 lore raw
In reply to Roland Stigge
Quoted 9 lines · Roland Stigge
Quoted 5 lines · Guenter Roeck
Quoted 4 lines

Added support for Dallas Semiconductor DS620

Queued for -next.

Thanks in advance!

Quoted 9 lines

Another question: I will need to write a driver for the MAX518 DAC. What is the appropriate place?

* hwmon (well, it is an analog _output_, not a monioring input)
* gpio (it is an analog, not _digital_ 0/1 output)
* misc

?

Sorry, I was out for a few days. iio (in staging) might be the best fit.

Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#10 lore raw
In reply to Roland Stigge
Quoted 5 lines · Roland Stigge

Hi,

thanks again for your valuable feedback!

Attaching the updated patch including your proposed changes.

Do you actually need the detection function? It's pretty weak, the DS620 has no ID registers, detection can't be reliable, I'd rather not have it at all.

(The DS1621 is detected for historical reasons, but quite frankly, it shouldn't have been either, and we might drop that someday.)

Signature · 6 lines
Jean Delvare

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
#11 lore raw
In reply to Roland Stigge

Hi,

Quoted 5 lines · Jean Delvare
Quoted 4 lines · Roland Stigge

Hi,

thanks again for your valuable feedback!

Quoted 8 lines
Quoted 1 line

Attaching the updated patch including your proposed changes.

Do you actually need the detection function? It's pretty weak, the DS620 has no ID registers, detection can't be reliable, I'd rather not have it at all.

(The DS1621 is detected for historical reasons, but quite frankly, it shouldn't have been either, and we might drop that someday.)

Thanks for your hint!

I'm attaching my updated patch. You can also merge from git.antcom.de, repo linux-2.6, branch ds620.

I also added a runtime configuration device attribute for the thermostat functionality.

Thanks,

bye,
Roland

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Documentation/hwmon/ds620 new file +34 -0
new file mode 100644
index 0000000..1acd21e
@@ -0,0 +1,34 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+
+The thermostat function works as follows: When configured via the sysfs
+attribute temp1_thmode == 0 (default), the thermostat is in TH_LOW mode. I.e.
+the alarm becomes active when the temperature falls below temp1_min and stays
+active until the temperature goes above temp1_max.
+
+Likewise, with temp1_thmode == 1, the thermostat is in TH_HIGH mode. I.e., the
+alarm becomes active when the temperature goes above temp1_max and stays active
+until the temperature falls below temp1_min.
+
+The PO output pin is always active-low.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +382 -0

382 lines not on this page · raw message

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#12 lore raw
In reply to Roland Stigge
Quoted 17 lines · Roland Stigge

Hi,

Quoted 5 lines · Jean Delvare
Quoted 4 lines · Roland Stigge

Hi,

thanks again for your valuable feedback!

Quoted 8 lines
Quoted 1 line

Attaching the updated patch including your proposed changes.

Do you actually need the detection function? It's pretty weak, the DS620 has no ID registers, detection can't be reliable, I'd rather not have it at all.

(The DS1621 is detected for historical reasons, but quite frankly, it shouldn't have been either, and we might drop that someday.)

Quoted 8 lines

Thanks for your hint!

I'm attaching my updated patch. You can also merge from git.antcom.de, repo linux-2.6, branch ds620.

I also added a runtime configuration device attribute for the thermostat functionality.

Unfortunately, that adds a non-standard and non-documented ABI attribute, so no one will be able to use it. Also, from reading the specification, it seems like it would more appropriate to set this through platform data (if it really has to be configurable).

Btw, can you write Documentation/hwmon/ds620 ? I completely forgot to ask for that.

Thanks,
Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#13 lore raw
In reply to Roland Stigge

Hi,

Quoted 9 lines · Guenter Roeck
Quoted 6 lines

I'm attaching my updated patch. You can also merge from git.antcom.de, repo linux-2.6, branch ds620.

I also added a runtime configuration device attribute for the thermostat functionality.

Unfortunately, that adds a non-standard and non-documented ABI attribute, so no one will be able to use it. Also, from reading the specification, it seems like it would more appropriate to set this through platform data (if it really has to be configurable).

Oops, sorry!

What can we do if we want to make it configurable at runtime? I'm not using it currently this way, but users could be. Or should we just make ist platform data to adhere to spec restrictions?

Quoted 1 line

Btw, can you write Documentation/hwmon/ds620 ? I completely forgot to ask for that.

It was already included in the last patches, since you already asked about it. :-)

bye,
Roland

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#14 lore raw
In reply to Roland Stigge
Quoted 13 lines · Roland Stigge

Hi,

Quoted 9 lines · Guenter Roeck
Quoted 6 lines

I'm attaching my updated patch. You can also merge from git.antcom.de, repo linux-2.6, branch ds620.

I also added a runtime configuration device attribute for the thermostat functionality.

Unfortunately, that adds a non-standard and non-documented ABI attribute, so no one will be able to use it. Also, from reading the specification, it seems like it would more appropriate to set this through platform data (if it really has to be configurable).

Quoted 6 lines

Oops, sorry!

What can we do if we want to make it configurable at runtime? I'm not using it currently this way, but users could be. Or should we just make ist platform data to adhere to spec restrictions?

I would suggest to implement it as platform data. If anyone ever needs it runtime-configurable, we can still think about some way to do it.

Quoted 5 lines
Quoted 1 line

Btw, can you write Documentation/hwmon/ds620 ? I completely forgot to ask for that.

It was already included in the last patches, since you already asked about it. :-)

I must be blind :(.

Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#15 lore raw
In reply to Roland Stigge

Hi,

Quoted 6 lines · Guenter Roeck
Quoted 4 lines

What can we do if we want to make it configurable at runtime? I'm not using it currently this way, but users could be. Or should we just make ist platform data to adhere to spec restrictions?

I would suggest to implement it as platform data. If anyone ever needs it runtime-configurable, we can still think about some way to do it.

I'm attaching the updated patch according to your suggestions, including Documentation updates. :-)

Thanks,

Roland

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Documentation/hwmon/ds620 new file +34 -0
new file mode 100644
index 0000000..c0edc34
@@ -0,0 +1,34 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+
+The thermostat function works as follows: When configured via platform_data
+(struct ds620_platform_data) .thmode == 0 (default), the thermostat is in
+TH_LOW mode. I.e., the alarm becomes active when the temperature falls below
+temp1_min and stays active until the temperature goes above temp1_max.
+
+Likewise, with .thmode == 1, the thermostat is in TH_HIGH mode. I.e., the alarm
+becomes active when the temperature goes above temp1_max and stays active until
+the temperature falls below temp1_min.
+
+The PO output pin is always active-low.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +344 -0

344 lines not on this page · raw message

include/linux/i2c/ds620.h new file +15 -0
new file mode 100644
index 0000000..e9a4dcc
@@ -0,0 +1,15 @@
+#ifndef _LINUX_DS620_H
+#define _LINUX_DS620_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
+/* platform data for the DS620 temperature sensor and thermostat */
+
+struct ds620_platform_data {
+	/* Thermostat Mode: 0 = TH_LOW, 1 = TH_HIGH */
+	/* (see Documentation/hwmon/ds620) */
+	bool thmode;
+};
+
+#endif /* _LINUX_DS620_H */

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#16 lore raw
In reply to Roland Stigge
Quoted 13 lines · Roland Stigge

Hi,

Quoted 6 lines · Guenter Roeck
Quoted 4 lines

What can we do if we want to make it configurable at runtime? I'm not using it currently this way, but users could be. Or should we just make ist platform data to adhere to spec restrictions?

I would suggest to implement it as platform data. If anyone ever needs it runtime-configurable, we can still think about some way to do it.

I'm attaching the updated patch according to your suggestions, including Documentation updates. :-)

Quoted 8 lines

Thanks,

Roland

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Hi Roland,

couple of comments below.

Documentation/hwmon/ds620 line 6

Quoted 12 lines
Documentation/hwmon/ds620 new file +6 -0
new file mode 100644
index 0000000..c0edc34
@@ -0,0 +1,34 @@
+Kernel driver ds620
+=========> +
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Addresses scanned: I2C 0x48 - 0x4f

None anymore, really.

Quoted 15 lines
Documentation/hwmon/ds620 new file +15 -0
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value

Documentation/hwmon/ds620 line 31

Quoted 10 lines
Documentation/hwmon/ds620 new file +10 -0
+returned via sysfs displays post decimal positions.
+
+The thermostat function works as follows: When configured via platform_data
+(struct ds620_platform_data) .thmode = 0 (default), the thermostat is in
+TH_LOW mode. I.e., the alarm becomes active when the temperature falls below
+temp1_min and stays active until the temperature goes above temp1_max.
+
+Likewise, with .thmode = 1, the thermostat is in TH_HIGH mode. I.e., the alarm
+becomes active when the temperature goes above temp1_max and stays active until
+the temperature falls below temp1_min.

"the alarm" ? I don't think that is accurate. Alarms bits are independent of the PO mode. You are trying to configure the PO pin. thmode and the description above is thus a bit misleading.

If anything, you might want to define .pomode, such as:

	.pomode = 0: always low (PO1 = x, PO2 = 0)
	.pomode = 1: po_low (PO1 = 0, PO2 = 1)
	.pomode = 2: po_high (PO1 = 1, PO2 = 1)

Documentation/hwmon/ds620 line 33

Quoted 2 lines
Documentation/hwmon/ds620 new file +2 -0
+
+The PO output pin is always active-low.

What is the point of configuring PO1 if you set PO2 such that PO is always low ? Datasheet says that if PO2=low, PO will always be low independent of PO1.

Quoted 67 lines
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +28 -0
new file mode 100644
index 0000000..62e4f0d
@@ -0,0 +1,344 @@
+/*
+    ds620.c - Support for temperature sensor and thermostat DS620
+
+    Copyright (C) 2010, 2011 Roland Stigge <[email protected]>
+
+    based on ds1621.c by Christian W. Zuckschwerdt  <[email protected]>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+*/
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>

drivers/hwmon/ds620.c line 38

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+#include <linux/i2c/ds620.h>
+
+/* Addresses to scan */
+static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4b, 0x4c,
+					0x4d, 0x4e, 0x4f, I2C_CLIENT_END
+};

No longer needed since addresses are not scanned anymore.

Quoted 36 lines
drivers/hwmon/ds620.c new file +36 -0
+
+/* Many DS620 constants specified below        */
+/*  15   14   13   12   11   10   09    08     */
+/* |Done|NVB |THF |TLF |R1  |R0  |AUTOC|1SHOT| */
+
+/*  07   06   05   04   03   02   01    00     */
+/* |PO2 |PO1 |A2  |A1  |A0  |    |     |     | */
+#define DS620_REG_CONFIG_DONE		0x8000
+#define DS620_REG_CONFIG_NVB		0x4000
+#define DS620_REG_CONFIG_THF		0x2000
+#define DS620_REG_CONFIG_TLF		0x1000
+#define DS620_REG_CONFIG_R1		0x0800
+#define DS620_REG_CONFIG_R0		0x0400
+#define DS620_REG_CONFIG_AUTOC		0x0200
+#define DS620_REG_CONFIG_1SHOT		0x0100
+#define DS620_REG_CONFIG_PO2		0x0080
+#define DS620_REG_CONFIG_PO1		0x0040
+#define DS620_REG_CONFIG_A2		0x0020
+#define DS620_REG_CONFIG_A1		0x0010
+#define DS620_REG_CONFIG_A0		0x0008
+
+/* The DS620 registers */
+static const u8 DS620_REG_TEMP[3] = {
+	0xAA,			/* input, word, RO */
+	0xA2,			/* min, word, RW */
+	0xA0,			/* max, word, RW */
+};
+
+#define DS620_REG_CONF		0xAC	/* word, RW */
+#define DS620_COM_START		0x51	/* no data */
+#define DS620_COM_STOP		0x22	/* no data */
+
+/* Each client has this additional data */
+struct ds620_data {
+	struct device *hwmon_dev;
+	struct mutex update_lock;

drivers/hwmon/ds620.c line 86

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+	char valid;		/* !=0 if following fields are valid */
+	unsigned long last_updated;	/* In jiffies */
+
+	u16 temp[3];		/* Register values, word */
+	u16 conf;		/* Register encoding, combined */
+};
+
+/* Temperature registers are word-sized.
+   DS620 uses a high-byte first convention, which is exactly opposite to
+   the SMBus standard. */

Please use multi-line comment format as described in Documentation/CodingStyle.

Quoted 9 lines
drivers/hwmon/ds620.c new file +9 -0
+static int ds620_read_temp(struct i2c_client *client, u8 reg)
+{
+	int ret;
+
+	ret = i2c_smbus_read_word_data(client, reg);
+	if (ret < 0)
+		return ret;
+	return swab16(ret);
+}

drivers/hwmon/ds620.c

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+
+static int ds620_write_temp(struct i2c_client *client, u8 reg, u16 value)
+{
+	return i2c_smbus_write_word_data(client, reg, swab16(value));
+}
+
+static void ds620_init_client(struct i2c_client *client)
+{
+	struct ds620_data *data = i2c_get_clientdata(client);
+	struct ds620_platform_data *ds620_info > +		(struct ds620_platform_data *)&client->dev.platform_data;

platform_data is a void *, so you don't need a typecast here.

drivers/hwmon/ds620.c

Quoted 6 lines
drivers/hwmon/ds620.c new file +6 -0
+	u16 conf, new_conf;
+
+	new_conf = conf > +	    swab16(i2c_smbus_read_word_data(client, DS620_REG_CONF));
+
+	/* switch to continuous conversion mode */
+	new_conf &= ~(DS620_REG_CONFIG_1SHOT);

( ) is really unnecessary here.

drivers/hwmon/ds620.c line 152

Quoted 12 lines
drivers/hwmon/ds620.c new file +12 -0
+	/* thermostat mode according to platform data */
+	if (ds620_info && ds620_info->thmode)
+		new_conf |= DS620_REG_CONFIG_PO1; /* TH_HIGH */
+	else
+		new_conf &= ~DS620_REG_CONFIG_PO1; /* TH_LOW */
+	/* with highest precision */
+	new_conf |= DS620_REG_CONFIG_R1 | DS620_REG_CONFIG_R0;
+
+	if (conf != new_conf) {
+		i2c_smbus_write_word_data(client, DS620_REG_CONF,
+					  swab16(new_conf));
+	}

{ } is unnecessary here.

Quoted 92 lines
drivers/hwmon/ds620.c new file +92 -0
+
+	data->conf = new_conf;
+
+	/* start conversion */
+	i2c_smbus_write_byte(client, DS620_COM_START);
+}
+
+static struct ds620_data *ds620_update_client(struct device *dev)
+{
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+	struct ds620_data *ret = data;
+
+	mutex_lock(&data->update_lock);
+
+	if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+	    || !data->valid) {
+		int i;
+		int res;
+
+		dev_dbg(&client->dev, "Starting ds620 update\n");
+
+		for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
+			res = ds620_read_temp(client,
+					      DS620_REG_TEMP[i]);
+			if (res < 0) {
+				ret = ERR_PTR(res);
+				goto abort;
+			}
+
+			data->temp[i] = res;
+		}
+
+		data->last_updated = jiffies;
+		data->valid = 1;
+	}
+abort:
+	mutex_unlock(&data->update_lock);
+
+	return ret;
+}
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+			 char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct ds620_data *data = ds620_update_client(dev);
+
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	return sprintf(buf, "%d\n", ((data->temp[attr->index] / 8) * 625) / 10);
+}
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{
+	int res;
+	long val;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	res = strict_strtol(buf, 10, &val);
+
+	if (res)
+		return res;
+
+	val = (val * 10 / 625) * 8;
+
+	mutex_lock(&data->update_lock);
+	data->temp[attr->index] = val;
+	ds620_write_temp(client, DS620_REG_TEMP[attr->index],
+			 data->temp[attr->index]);
+	mutex_unlock(&data->update_lock);
+	return count;
+}
+
+static ssize_t show_alarm(struct device *dev, struct device_attribute *da,
+			  char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct ds620_data *data = ds620_update_client(dev);
+	struct i2c_client *client = to_i2c_client(dev);
+	u16 new_conf;
+	int res;
+
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	/* reset alarms if necessary */

drivers/hwmon/ds620.c line 223

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+	res = i2c_smbus_read_word_data(client, DS620_REG_CONF);
+	if (res < 0)
+		return res;
+
+	data->conf = swab16(res);
+	new_conf = data->conf;
+	if (data->temp[0] > data->temp[1])	/* input > min */
+		new_conf &= ~DS620_REG_CONFIG_TLF;
+	if (data->temp[0] < data->temp[2])	/* input < max */
+		new_conf &= ~DS620_REG_CONFIG_THF;

After reading the datasheet, I think you can simplify this and just reset the bit if it was set. If the condition still applies, the chip should set it again. Also, as written, one of the alarms may not be reported at all.
Example: If both alarms are set, and the lower alarm is read first, the code here will also reset the upper alarm without reporting it. As such,

	new_conf &= ~attr->index;

would be simpler and should accomplish the same.

Also, from looking through the code again, you don't need data->conf in the first place, since it is never used outside its local context. A local variable should do it.

Quoted 91 lines
drivers/hwmon/ds620.c new file +91 -0
+	if (data->conf != new_conf) {
+		res = i2c_smbus_write_word_data(client, DS620_REG_CONF,
+						swab16(new_conf));
+		if (res < 0)
+			return res;
+	}
+
+	return sprintf(buf, "%d\n", !!(data->conf & attr->index));
+}
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp, 1);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp, 2);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL,
+			  DS620_REG_CONFIG_TLF);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL,
+			  DS620_REG_CONFIG_THF);
+
+static struct attribute *ds620_attributes[] = {
+	&sensor_dev_attr_temp1_input.dev_attr.attr,
+	&sensor_dev_attr_temp1_min.dev_attr.attr,
+	&sensor_dev_attr_temp1_max.dev_attr.attr,
+	&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group ds620_group = {
+	.attrs = ds620_attributes,
+};
+
+static int ds620_probe(struct i2c_client *client,
+		       const struct i2c_device_id *id)
+{
+	struct ds620_data *data;
+	int err;
+
+	data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL);
+	if (!data) {
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->update_lock);
+
+	/* Initialize the DS620 chip */
+	ds620_init_client(client);
+
+	/* Register sysfs hooks */
+	err = sysfs_create_group(&client->dev.kobj, &ds620_group);
+	if (err)
+		goto exit_free;
+
+	data->hwmon_dev = hwmon_device_register(&client->dev);
+	if (IS_ERR(data->hwmon_dev)) {
+		err = PTR_ERR(data->hwmon_dev);
+		goto exit_remove_files;
+	}
+
+	dev_info(&client->dev, "temperature sensor found\n");
+
+	return 0;
+
+exit_remove_files:
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+exit_free:
+	kfree(data);
+exit:
+	return err;
+}
+
+static int ds620_remove(struct i2c_client *client)
+{
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	hwmon_device_unregister(data->hwmon_dev);
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+
+	kfree(data);
+
+	return 0;
+}
+
+static const struct i2c_device_id ds620_id[] = {
+	{"ds620", 0},
+	{}
+};
+
+MODULE_DEVICE_TABLE(i2c, ds620_id);
+

drivers/hwmon/ds620.c

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+/* This is the driver that will be inserted */
+static struct i2c_driver ds620_driver = {
+	.class = I2C_CLASS_HWMON,
+	.driver = {
+		   .name = "ds620",
+	},
+	.probe = ds620_probe,
+	.remove = ds620_remove,
+	.id_table = ds620_id,
+	.address_list = normal_i2c,

Address list is no longer needed and can be removed.

Quoted 29 lines
drivers/hwmon/ds620.c new file +18 -0
+};
+
+static int __init ds620_init(void)
+{
+	return i2c_add_driver(&ds620_driver);
+}
+
+static void __exit ds620_exit(void)
+{
+	i2c_del_driver(&ds620_driver);
+}
+
+MODULE_AUTHOR("Roland Stigge <[email protected]>");
+MODULE_DESCRIPTION("DS620 driver");
+MODULE_LICENSE("GPL");
+
+module_init(ds620_init);
+module_exit(ds620_exit);
include/linux/i2c/ds620.h new file +5 -0
new file mode 100644
index 0000000..e9a4dcc
@@ -0,0 +1,15 @@
+#ifndef _LINUX_DS620_H
+#define _LINUX_DS620_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>

include/linux/i2c/ds620.h line 15

Quoted 10 lines
include/linux/i2c/ds620.h new file +10 -0
+
+/* platform data for the DS620 temperature sensor and thermostat */
+
+struct ds620_platform_data {
+	/* Thermostat Mode: 0 = TH_LOW, 1 = TH_HIGH */
+	/* (see Documentation/hwmon/ds620) */
+	bool thmode;
+};
+
+#endif /* _LINUX_DS620_H */

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#17 lore raw
In reply to Roland Stigge

Hi,

Quoted 1 line · Guenter Roeck

couple of comments below.

Thanks again for your suggestions! I'm attaching the latest version with your ideas included.

Quoted 3 lines
Quoted 1 line

+The PO output pin is always active-low.

What is the point of configuring PO1 if you set PO2 such that PO is always low ?

Maybe the above was a bit misleading, though correct: "always active-low" wasn't intended to mean "always low", but instead "low when active". :-) Nevertheless, I clarified it. ("The PO output pin of the DS620 operates active-low.").

Thanks,

Roland

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Documentation/hwmon/ds620 new file +34 -0
new file mode 100644
index 0000000..0c765b0
@@ -0,0 +1,34 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+
+The thermostat function works as follows: When configured via platform_data
+(struct ds620_platform_data) .pomode == 0 (default), the thermostat output pin
+PO is always low. If .pomode == 1, the thermostat is in TH_LOW mode. I.e., the
+output pin PO becomes active when the temperature falls below temp1_min and
+stays active until the temperature goes above temp1_max.
+
+Likewise, with .pomode == 2, the thermostat is in TH_HIGH mode. I.e., the PO
+output pin becomes active when the temperature goes above temp1_max and stays
+active until the temperature falls below temp1_min.
+
+The PO output pin of the DS620 operates active-low.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +335 -0

335 lines not on this page · raw message

include/linux/i2c/ds620.h new file +21 -0
new file mode 100644
index 0000000..141c043
@@ -0,0 +1,21 @@
+#ifndef _LINUX_DS620_H
+#define _LINUX_DS620_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
+/* platform data for the DS620 temperature sensor and thermostat */
+
+struct ds620_platform_data {
+	/*
+	 *  Thermostat output pin PO mode:
+	 *  0 = always low (default)
+	 *  1 = TH_LOW
+	 *  2 = TH_HIGH
+	 *
+	 * (see Documentation/hwmon/ds620)
+	 */
+	bool pomode;
+};
+
+#endif /* _LINUX_DS620_H */

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#18 lore raw
In reply to Roland Stigge
Quoted 17 lines · Roland Stigge

Hi,

Quoted 1 line · Guenter Roeck

couple of comments below.

Thanks again for your suggestions! I'm attaching the latest version with your ideas included.

Quoted 3 lines
Quoted 1 line

+The PO output pin is always active-low.

What is the point of configuring PO1 if you set PO2 such that PO is always low ?

Maybe the above was a bit misleading, though correct: "always active-low" wasn't intended to mean "always low", but instead "low when active". :-) Nevertheless, I clarified it. ("The PO output pin of the DS620 operates active-low.").

Quoted 8 lines

Thanks,

Roland

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Almost ... see below.

Quoted 28 lines
Documentation/hwmon/ds620 new file +22 -0
new file mode 100644
index 0000000..0c765b0
@@ -0,0 +1,34 @@
+Kernel driver ds620
+=========> +
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+

Documentation/hwmon/ds620 line 32

Quoted 10 lines
Documentation/hwmon/ds620 new file +10 -0
+The thermostat function works as follows: When configured via platform_data
+(struct ds620_platform_data) .pomode = 0 (default), the thermostat output pin
+PO is always low. If .pomode = 1, the thermostat is in TH_LOW mode. I.e., the
+output pin PO becomes active when the temperature falls below temp1_min and
+stays active until the temperature goes above temp1_max.
+
+Likewise, with .pomode = 2, the thermostat is in TH_HIGH mode. I.e., the PO
+output pin becomes active when the temperature goes above temp1_max and stays
+active until the temperature falls below temp1_min.
+

Datasheet does not say TH_HIGH or TH_LOW, but uses PO-HIGH and PO-LOW. Might be better to use that terminology to avoid confusion.

Quoted 143 lines
Documentation/hwmon/ds620 new file +1 -0
+The PO output pin of the DS620 operates active-low.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +103 -0
new file mode 100644
index 0000000..624950d
@@ -0,0 +1,335 @@
+/*
+ *  ds620.c - Support for temperature sensor and thermostat DS620
+ *
+ *  Copyright (C) 2010, 2011 Roland Stigge <[email protected]>
+ *
+ *  based on ds1621.c by Christian W. Zuckschwerdt  <[email protected]>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/module.h>
+#include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/jiffies.h>
+#include <linux/i2c.h>
+#include <linux/hwmon.h>
+#include <linux/hwmon-sysfs.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/sysfs.h>
+#include <linux/i2c/ds620.h>
+
+/*
+ * Many DS620 constants specified below
+ *  15   14   13   12   11   10   09    08
+ * |Done|NVB |THF |TLF |R1  |R0  |AUTOC|1SHOT|
+ *
+ *  07   06   05   04   03   02   01    00
+ * |PO2 |PO1 |A2  |A1  |A0  |    |     |     |
+ */
+#define DS620_REG_CONFIG_DONE		0x8000
+#define DS620_REG_CONFIG_NVB		0x4000
+#define DS620_REG_CONFIG_THF		0x2000
+#define DS620_REG_CONFIG_TLF		0x1000
+#define DS620_REG_CONFIG_R1		0x0800
+#define DS620_REG_CONFIG_R0		0x0400
+#define DS620_REG_CONFIG_AUTOC		0x0200
+#define DS620_REG_CONFIG_1SHOT		0x0100
+#define DS620_REG_CONFIG_PO2		0x0080
+#define DS620_REG_CONFIG_PO1		0x0040
+#define DS620_REG_CONFIG_A2		0x0020
+#define DS620_REG_CONFIG_A1		0x0010
+#define DS620_REG_CONFIG_A0		0x0008
+
+/* The DS620 registers */
+static const u8 DS620_REG_TEMP[3] = {
+	0xAA,			/* input, word, RO */
+	0xA2,			/* min, word, RW */
+	0xA0,			/* max, word, RW */
+};
+
+#define DS620_REG_CONF		0xAC	/* word, RW */
+#define DS620_COM_START		0x51	/* no data */
+#define DS620_COM_STOP		0x22	/* no data */
+
+/* Each client has this additional data */
+struct ds620_data {
+	struct device *hwmon_dev;
+	struct mutex update_lock;
+	char valid;		/* !=0 if following fields are valid */
+	unsigned long last_updated;	/* In jiffies */
+
+	u16 temp[3];		/* Register values, word */
+};
+
+/*
+ *  Temperature registers are word-sized.
+ *  DS620 uses a high-byte first convention, which is exactly opposite to
+ *  the SMBus standard.
+ */
+static int ds620_read_temp(struct i2c_client *client, u8 reg)
+{
+	int ret;
+
+	ret = i2c_smbus_read_word_data(client, reg);
+	if (ret < 0)
+		return ret;
+	return swab16(ret);
+}
+
+static int ds620_write_temp(struct i2c_client *client, u8 reg, u16 value)
+{
+	return i2c_smbus_write_word_data(client, reg, swab16(value));
+}
+
+static void ds620_init_client(struct i2c_client *client)
+{
+	struct ds620_platform_data *ds620_info = client->dev.platform_data;
+	u16 conf, new_conf;
+
+	new_conf = conf > +	    swab16(i2c_smbus_read_word_data(client, DS620_REG_CONF));

drivers/hwmon/ds620.c line 113

Quoted 10 lines
drivers/hwmon/ds620.c new file +10 -0
+
+	/* switch to continuous conversion mode */
+	new_conf &= ~DS620_REG_CONFIG_1SHOT;
+	/* thermostat mode according to platform data */
+	if (ds620_info && ds620_info->pomode = 1)
+		new_conf &= ~DS620_REG_CONFIG_PO1; /* TH_LOW */
+	else if (ds620_info && ds620_info->pomode = 2)
+		new_conf |= DS620_REG_CONFIG_PO1; /* TH_HIGH */
+	else
+		new_conf &= ~DS620_REG_CONFIG_PO2; /* always low */

Hmm .. this code never sets PO2, but only resets it.
Sure, it is high by default, but you don't really know if it was set to low by the BIOS. To be sure, you might want to set it high if enabled.

Quoted 235 lines
drivers/hwmon/ds620.c new file +221 -0
+	/* with highest precision */
+	new_conf |= DS620_REG_CONFIG_R1 | DS620_REG_CONFIG_R0;
+
+	if (conf != new_conf)
+		i2c_smbus_write_word_data(client, DS620_REG_CONF,
+					  swab16(new_conf));
+
+	/* start conversion */
+	i2c_smbus_write_byte(client, DS620_COM_START);
+}
+
+static struct ds620_data *ds620_update_client(struct device *dev)
+{
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+	struct ds620_data *ret = data;
+
+	mutex_lock(&data->update_lock);
+
+	if (time_after(jiffies, data->last_updated + HZ + HZ / 2)
+	    || !data->valid) {
+		int i;
+		int res;
+
+		dev_dbg(&client->dev, "Starting ds620 update\n");
+
+		for (i = 0; i < ARRAY_SIZE(data->temp); i++) {
+			res = ds620_read_temp(client,
+					      DS620_REG_TEMP[i]);
+			if (res < 0) {
+				ret = ERR_PTR(res);
+				goto abort;
+			}
+
+			data->temp[i] = res;
+		}
+
+		data->last_updated = jiffies;
+		data->valid = 1;
+	}
+abort:
+	mutex_unlock(&data->update_lock);
+
+	return ret;
+}
+
+static ssize_t show_temp(struct device *dev, struct device_attribute *da,
+			 char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct ds620_data *data = ds620_update_client(dev);
+
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	return sprintf(buf, "%d\n", ((data->temp[attr->index] / 8) * 625) / 10);
+}
+
+static ssize_t set_temp(struct device *dev, struct device_attribute *da,
+			const char *buf, size_t count)
+{
+	int res;
+	long val;
+
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct i2c_client *client = to_i2c_client(dev);
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	res = strict_strtol(buf, 10, &val);
+
+	if (res)
+		return res;
+
+	val = (val * 10 / 625) * 8;
+
+	mutex_lock(&data->update_lock);
+	data->temp[attr->index] = val;
+	ds620_write_temp(client, DS620_REG_TEMP[attr->index],
+			 data->temp[attr->index]);
+	mutex_unlock(&data->update_lock);
+	return count;
+}
+
+static ssize_t show_alarm(struct device *dev, struct device_attribute *da,
+			  char *buf)
+{
+	struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+	struct ds620_data *data = ds620_update_client(dev);
+	struct i2c_client *client = to_i2c_client(dev);
+	u16 conf, new_conf;
+	int res;
+
+	if (IS_ERR(data))
+		return PTR_ERR(data);
+
+	/* reset alarms if necessary */
+	res = i2c_smbus_read_word_data(client, DS620_REG_CONF);
+	if (res < 0)
+		return res;
+
+	conf = swab16(res);
+	new_conf = conf;
+	new_conf &= ~attr->index;
+	if (conf != new_conf) {
+		res = i2c_smbus_write_word_data(client, DS620_REG_CONF,
+						swab16(new_conf));
+		if (res < 0)
+			return res;
+	}
+
+	return sprintf(buf, "%d\n", !!(conf & attr->index));
+}
+
+static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, show_temp, NULL, 0);
+static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, show_temp, set_temp, 1);
+static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, show_temp, set_temp, 2);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, show_alarm, NULL,
+			  DS620_REG_CONFIG_TLF);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, show_alarm, NULL,
+			  DS620_REG_CONFIG_THF);
+
+static struct attribute *ds620_attributes[] = {
+	&sensor_dev_attr_temp1_input.dev_attr.attr,
+	&sensor_dev_attr_temp1_min.dev_attr.attr,
+	&sensor_dev_attr_temp1_max.dev_attr.attr,
+	&sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
+	&sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group ds620_group = {
+	.attrs = ds620_attributes,
+};
+
+static int ds620_probe(struct i2c_client *client,
+		       const struct i2c_device_id *id)
+{
+	struct ds620_data *data;
+	int err;
+
+	data = kzalloc(sizeof(struct ds620_data), GFP_KERNEL);
+	if (!data) {
+		err = -ENOMEM;
+		goto exit;
+	}
+
+	i2c_set_clientdata(client, data);
+	mutex_init(&data->update_lock);
+
+	/* Initialize the DS620 chip */
+	ds620_init_client(client);
+
+	/* Register sysfs hooks */
+	err = sysfs_create_group(&client->dev.kobj, &ds620_group);
+	if (err)
+		goto exit_free;
+
+	data->hwmon_dev = hwmon_device_register(&client->dev);
+	if (IS_ERR(data->hwmon_dev)) {
+		err = PTR_ERR(data->hwmon_dev);
+		goto exit_remove_files;
+	}
+
+	dev_info(&client->dev, "temperature sensor found\n");
+
+	return 0;
+
+exit_remove_files:
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+exit_free:
+	kfree(data);
+exit:
+	return err;
+}
+
+static int ds620_remove(struct i2c_client *client)
+{
+	struct ds620_data *data = i2c_get_clientdata(client);
+
+	hwmon_device_unregister(data->hwmon_dev);
+	sysfs_remove_group(&client->dev.kobj, &ds620_group);
+
+	kfree(data);
+
+	return 0;
+}
+
+static const struct i2c_device_id ds620_id[] = {
+	{"ds620", 0},
+	{}
+};
+
+MODULE_DEVICE_TABLE(i2c, ds620_id);
+
+/* This is the driver that will be inserted */
+static struct i2c_driver ds620_driver = {
+	.class = I2C_CLASS_HWMON,
+	.driver = {
+		   .name = "ds620",
+	},
+	.probe = ds620_probe,
+	.remove = ds620_remove,
+	.id_table = ds620_id,
+};
+
+static int __init ds620_init(void)
+{
+	return i2c_add_driver(&ds620_driver);
+}
+
+static void __exit ds620_exit(void)
+{
+	i2c_del_driver(&ds620_driver);
+}
+
+MODULE_AUTHOR("Roland Stigge <[email protected]>");
+MODULE_DESCRIPTION("DS620 driver");
+MODULE_LICENSE("GPL");
+
+module_init(ds620_init);
+module_exit(ds620_exit);
include/linux/i2c/ds620.h new file +8 -0
new file mode 100644
index 0000000..141c043
@@ -0,0 +1,21 @@
+#ifndef _LINUX_DS620_H
+#define _LINUX_DS620_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
+/* platform data for the DS620 temperature sensor and thermostat */
+

include/linux/i2c/ds620.h line 18

Quoted 10 lines
include/linux/i2c/ds620.h new file +10 -0
+struct ds620_platform_data {
+	/*
+	 *  Thermostat output pin PO mode:
+	 *  0 = always low (default)
+	 *  1 = TH_LOW
+	 *  2 = TH_HIGH
+	 *
+	 * (see Documentation/hwmon/ds620)
+	 */
+	bool pomode;

Difficult to assign 2 to a bool ... needs int here.

include/linux/i2c/ds620.h line 21

Quoted 3 lines
include/linux/i2c/ds620.h new file +3 -0
+};
+
+#endif /* _LINUX_DS620_H */

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#19 lore raw
In reply to Roland Stigge

Hi,

Quoted 5 lines · Guenter Roeck
Quoted 4 lines

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Almost ... see below.

Update attached. :-)

bye,
Roland

Documentation/hwmon/ds620 new file +34 -0
new file mode 100644
index 0000000..1fbe3cd
@@ -0,0 +1,34 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+
+The thermostat function works as follows: When configured via platform_data
+(struct ds620_platform_data) .pomode == 0 (default), the thermostat output pin
+PO is always low. If .pomode == 1, the thermostat is in PO_LOW mode. I.e., the
+output pin PO becomes active when the temperature falls below temp1_min and
+stays active until the temperature goes above temp1_max.
+
+Likewise, with .pomode == 2, the thermostat is in PO_HIGH mode. I.e., the PO
+output pin becomes active when the temperature goes above temp1_max and stays
+active until the temperature falls below temp1_min.
+
+The PO output pin of the DS620 operates active-low.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +337 -0

337 lines not on this page · raw message

include/linux/i2c/ds620.h new file +21 -0
new file mode 100644
index 0000000..736bb87
@@ -0,0 +1,21 @@
+#ifndef _LINUX_DS620_H
+#define _LINUX_DS620_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
+/* platform data for the DS620 temperature sensor and thermostat */
+
+struct ds620_platform_data {
+	/*
+	 *  Thermostat output pin PO mode:
+	 *  0 = always low (default)
+	 *  1 = PO_LOW
+	 *  2 = PO_HIGH
+	 *
+	 * (see Documentation/hwmon/ds620)
+	 */
+	int pomode;
+};
+
+#endif /* _LINUX_DS620_H */

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#20 lore raw
In reply to Roland Stigge

Hi,

Quoted 5 lines · Guenter Roeck
Quoted 4 lines

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Almost ... see below.

Update attached. :-)

bye,
Roland

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Documentation/hwmon/ds620 new file +34 -0
new file mode 100644
index 0000000..1fbe3cd
@@ -0,0 +1,34 @@
+Kernel driver ds620
+===================
+
+Supported chips:
+  * Dallas Semiconductor DS620
+    Prefix: 'ds620'
+    Datasheet: Publicly available at the Dallas Semiconductor website
+               http://www.dalsemi.com/
+
+Authors:
+        Roland Stigge <[email protected]>
+        based on ds1621.c by
+        Christian W. Zuckschwerdt <[email protected]>
+
+Description
+-----------
+
+The DS620 is a (one instance) digital thermometer and thermostat. It has both
+high and low temperature limits which can be user defined (i.e.  programmed
+into non-volatile on-chip registers). Temperature range is -55 degree Celsius
+to +125. Between 0 and 70 degree Celsius, accuracy is 0.5 Kelvin. The value
+returned via sysfs displays post decimal positions.
+
+The thermostat function works as follows: When configured via platform_data
+(struct ds620_platform_data) .pomode == 0 (default), the thermostat output pin
+PO is always low. If .pomode == 1, the thermostat is in PO_LOW mode. I.e., the
+output pin PO becomes active when the temperature falls below temp1_min and
+stays active until the temperature goes above temp1_max.
+
+Likewise, with .pomode == 2, the thermostat is in PO_HIGH mode. I.e., the PO
+output pin becomes active when the temperature goes above temp1_max and stays
+active until the temperature falls below temp1_min.
+
+The PO output pin of the DS620 operates active-low.
drivers/hwmon/Kconfig +10 -0
index a56f6ad..700389a 100644
@@ -274,6 +274,16 @@ config SENSORS_ATXP1
 	  This driver can also be built as a module.  If so, the module
 	  will be called atxp1.
 
+config SENSORS_DS620
+	tristate "Dallas Semiconductor DS620"
+	depends on I2C
+	help
+	  If you say yes here you get support for Dallas Semiconductor
+	  DS620 sensor chip.
+
+	  This driver can also be built as a module.  If so, the module
+	  will be called ds620.
+
 config SENSORS_DS1621
 	tristate "Dallas Semiconductor DS1621 and DS1625"
 	depends on I2C
drivers/hwmon/Makefile +1 -0
index 2479b3d..42542d7 100644
@@ -41,6 +41,7 @@ obj-$(CONFIG_SENSORS_ATXP1)	+= atxp1.o
 obj-$(CONFIG_SENSORS_CORETEMP)	+= coretemp.o
 obj-$(CONFIG_SENSORS_PKGTEMP)	+= pkgtemp.o
 obj-$(CONFIG_SENSORS_DME1737)	+= dme1737.o
+obj-$(CONFIG_SENSORS_DS620)	+= ds620.o
 obj-$(CONFIG_SENSORS_DS1621)	+= ds1621.o
 obj-$(CONFIG_SENSORS_EMC1403)	+= emc1403.o
 obj-$(CONFIG_SENSORS_EMC2103)	+= emc2103.o
drivers/hwmon/ds620.c new file +337 -0

337 lines not on this page · raw message

include/linux/i2c/ds620.h new file +21 -0
new file mode 100644
index 0000000..736bb87
@@ -0,0 +1,21 @@
+#ifndef _LINUX_DS620_H
+#define _LINUX_DS620_H
+
+#include <linux/types.h>
+#include <linux/i2c.h>
+
+/* platform data for the DS620 temperature sensor and thermostat */
+
+struct ds620_platform_data {
+	/*
+	 *  Thermostat output pin PO mode:
+	 *  0 = always low (default)
+	 *  1 = PO_LOW
+	 *  2 = PO_HIGH
+	 *
+	 * (see Documentation/hwmon/ds620)
+	 */
+	int pomode;
+};
+
+#endif /* _LINUX_DS620_H */

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

#21 lore raw
In reply to Roland Stigge
Quoted 11 lines · Roland Stigge

Hi,

Quoted 5 lines · Guenter Roeck
Quoted 4 lines

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Almost ... see below.

Update attached. :-)

Quoted 8 lines

bye,
Roland

HWMON driver for Dallas Semiconductor DS620 temperature sensor and thermostat

Applied to -next.

Thanks,
Guenter

_______________________________________________
lm-sensors mailing list
[email protected]
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors