Patched in Tegra support.

1 files changed, 78 insertions, 51 deletions

diff --git a/drivers/hwmon/ds1621.c b/drivers/hwmon/ds1621.c
index 1c568736baf..e11363467a8 100644
--- a/drivers/hwmon/ds1621.c
+++ b/drivers/hwmon/ds1621.c
@@ -1,25 +1,25 @@
 /*
- * ds1621.c - Part of lm_sensors, Linux kernel modules for hardware
- *            monitoring
- * Christian W. Zuckschwerdt  <zany@triq.net>  2000-11-23
- * based on lm75.c by Frodo Looijaard <frodol@dds.nl>
- * Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with
- * the help of Jean Delvare <khali@linux-fr.org>
- *
- * 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.
- */
+    ds1621.c - Part of lm_sensors, Linux kernel modules for hardware
+             monitoring
+    Christian W. Zuckschwerdt  <zany@triq.net>  2000-11-23
+    based on lm75.c by Frodo Looijaard <frodol@dds.nl>
+    Ported to Linux 2.6 by Aurelien Jarno <aurelien@aurel32.net> with 
+    the help of Jean Delvare <khali@linux-fr.org>
+
+    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>
@@ -67,7 +67,7 @@ static const u8 DS1621_REG_TEMP[3] = {
 
 /* Conversions */
 #define ALARMS_FROM_REG(val) ((val) & \
-                        (DS1621_ALARM_TEMP_HIGH | DS1621_ALARM_TEMP_LOW))
+                              (DS1621_ALARM_TEMP_HIGH | DS1621_ALARM_TEMP_LOW))
 
 /* Each client has this additional data */
 struct ds1621_data {
@@ -80,6 +80,24 @@ struct ds1621_data {
         u8 conf;                        /* Register encoding, combined */
 };
 
+/* Temperature registers are word-sized.
+   DS1621 uses a high-byte first convention, which is exactly opposite to
+   the SMBus standard. */
+static int ds1621_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 ds1621_write_temp(struct i2c_client *client, u8 reg, u16 value)
+{
+        return i2c_smbus_write_word_data(client, reg, swab16(value));
+}
+
 static void ds1621_init_client(struct i2c_client *client)
 {
         u8 conf, new_conf;
@@ -93,10 +111,10 @@ static void ds1621_init_client(struct i2c_client *client)
                 new_conf &= ~DS1621_REG_CONFIG_POLARITY;
         else if (polarity == 1)
                 new_conf |= DS1621_REG_CONFIG_POLARITY;
-
+        
         if (conf != new_conf)
                 i2c_smbus_write_byte_data(client, DS1621_REG_CONF, new_conf);
-
+        
         /* start conversion */
         i2c_smbus_write_byte(client, DS1621_COM_START);
 }
@@ -118,7 +136,7 @@ static struct ds1621_data *ds1621_update_client(struct device *dev)
                 data->conf = i2c_smbus_read_byte_data(client, DS1621_REG_CONF);
 
                 for (i = 0; i < ARRAY_SIZE(data->temp); i++)
-                        data->temp[i] = i2c_smbus_read_word_swapped(client,
+                        data->temp[i] = ds1621_read_temp(client,
                                                          DS1621_REG_TEMP[i]);
 
                 /* reset alarms if necessary */
@@ -155,17 +173,12 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
         struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
         struct i2c_client *client = to_i2c_client(dev);
         struct ds1621_data *data = i2c_get_clientdata(client);
-        long val;
-        int err;
-
-        err = kstrtol(buf, 10, &val);
-        if (err)
-                return err;
+        u16 val = LM75_TEMP_TO_REG(simple_strtol(buf, NULL, 10));
 
         mutex_lock(&data->update_lock);
-        data->temp[attr->index] = LM75_TEMP_TO_REG(val);
-        i2c_smbus_write_word_swapped(client, DS1621_REG_TEMP[attr->index],
-                                     data->temp[attr->index]);
+        data->temp[attr->index] = val;
+        ds1621_write_temp(client, DS1621_REG_TEMP[attr->index],
+                          data->temp[attr->index]);
         mutex_unlock(&data->update_lock);
         return count;
 }
@@ -217,17 +230,14 @@ static int ds1621_detect(struct i2c_client *client,
         int conf, temp;
         int i;
 
-        if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE_DATA
-                                     | I2C_FUNC_SMBUS_WORD_DATA
+        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. It is lousy.
-         *
-         * The NVB bit should be low if no EEPROM write has been requested
-         * during the latest 10ms, which is highly improbable in our case.
-         */
+        /* Now, we do the remaining detection. It is lousy. */
+        /* The NVB bit should be low if no EEPROM write has been  requested
+           during the latest 10ms, which is highly improbable in our case. */
         conf = i2c_smbus_read_byte_data(client, DS1621_REG_CONF);
         if (conf < 0 || conf & DS1621_REG_CONFIG_NVB)
                 return -ENODEV;
@@ -249,10 +259,11 @@ static int ds1621_probe(struct i2c_client *client,
         struct ds1621_data *data;
         int err;
 
-        data = devm_kzalloc(&client->dev, sizeof(struct ds1621_data),
-                            GFP_KERNEL);
-        if (!data)
-                return -ENOMEM;
+        data = kzalloc(sizeof(struct ds1621_data), GFP_KERNEL);
+        if (!data) {
+                err = -ENOMEM;
+                goto exit;
+        }
 
         i2c_set_clientdata(client, data);
         mutex_init(&data->update_lock);
@@ -261,9 +272,8 @@ static int ds1621_probe(struct i2c_client *client,
         ds1621_init_client(client);
 
         /* Register sysfs hooks */
-        err = sysfs_create_group(&client->dev.kobj, &ds1621_group);
-        if (err)
-                return err;
+        if ((err = sysfs_create_group(&client->dev.kobj, &ds1621_group)))
+                goto exit_free;
 
         data->hwmon_dev = hwmon_device_register(&client->dev);
         if (IS_ERR(data->hwmon_dev)) {
@@ -273,8 +283,11 @@ static int ds1621_probe(struct i2c_client *client,
 
         return 0;
 
- exit_remove_files:
+      exit_remove_files:
         sysfs_remove_group(&client->dev.kobj, &ds1621_group);
+      exit_free:
+        kfree(data);
+      exit:
         return err;
 }
 
@@ -285,6 +298,8 @@ static int ds1621_remove(struct i2c_client *client)
         hwmon_device_unregister(data->hwmon_dev);
         sysfs_remove_group(&client->dev.kobj, &ds1621_group);
 
+        kfree(data);
+
         return 0;
 }
 
@@ -308,8 +323,20 @@ static struct i2c_driver ds1621_driver = {
         .address_list   = normal_i2c,
 };
 
-module_i2c_driver(ds1621_driver);
+static int __init ds1621_init(void)
+{
+        return i2c_add_driver(&ds1621_driver);
+}
+
+static void __exit ds1621_exit(void)
+{
+        i2c_del_driver(&ds1621_driver);
+}
+
 
 MODULE_AUTHOR("Christian W. Zuckschwerdt <zany@triq.net>");
 MODULE_DESCRIPTION("DS1621 driver");
 MODULE_LICENSE("GPL");
+
+module_init(ds1621_init);
+module_exit(ds1621_exit);