Sorry to all,
it's the first time I contribute to the kernel and I've done a bit of
confusion...
First of all, I apologize: there is no bug in Dirk's code.
What I've found is that I need to call set_current_state before
schedule_timeout,
otherways the system doesn't wait at all.
Below there is the patch to patch v4 with the changes pointed by Dirk and
Guenter.
- the {} in the if clause are in kernel style
- the enum is lowercase and is not initialized
- the msec variable is always >= 1 (because 128 >> 7 == 1)
- I've initialized in=0 because otherways I get a compiler warning
Thaks for your patience
Emiliano.
<<<< START >>>>
diff --git a/Documentation/hwmon/ads1015 b/Documentation/hwmon/ads1015
index 85ffd77..e12fd1c 100644
--- a/Documentation/hwmon/ads1015
+++ b/Documentation/hwmon/ads1015
@@ -6,6 +6,10 @@ Supported chips:
Prefix: 'ads1015'
Datasheet: Publicly available at the Texas Instruments website :
http://focus.ti.com/lit/ds/symlink/ads1015.pdf
+ * Texas Instruments ADS1115
+ Prefix: 'ads1115'
+ Datasheet: Publicly available at the Texas Instruments website :
+ http://focus.ti.com/lit/ds/symlink/ads1115.pdf
Authors:
Dirk Eibach, Guntermann & Drunck GmbH <eibach <at> gdsys.de>
@@ -13,9 +17,11 @@ Authors:
Description
-----------
-This driver implements support for the Texas Instruments ADS1015.
+This driver implements support for the Texas Instruments ADS1015 and
+ADS1115.
-This device is a 12-bit A-D converter with 4 inputs.
+ADS1015 is a 12-bit A-D converter with 4 inputs.
+ADS1115 is a 16-bit A-D converter with 4 inputs.
The inputs can be used single ended or in certain differential
combinations.
diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig
index 9abcc6b..9b3e3e9 100644
--- a/drivers/hwmon/Kconfig
+++ b/drivers/hwmon/Kconfig
@@ -856,7 +856,7 @@ config SENSORS_ADS1015
depends on I2C
help
If you say yes here you get support for Texas Instruments ADS1015
- 12-bit 4-input ADC device.
+ & ADS1115 12/16-bit 4-input ADC devices.
This driver can also be built as a module. If so, the module
will be called ads1015.
diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c
index 4572024..9a607b0 100644
--- a/drivers/hwmon/ads1015.c
+++ b/drivers/hwmon/ads1015.c
@@ -53,6 +53,12 @@ struct ads1015_data {
struct mutex update_lock; /* mutex protect updates */
struct attribute *attr_table[ADS1015_CONFIG_CHANNELS + 1];
struct attribute_group attr_group;
+ int id;
+};
+
+enum ads1015_num_id {
+ ads1015,
+ ads1115,
};
static s32 ads1015_read_reg(struct i2c_client *client, unsigned int reg)
@@ -78,6 +84,7 @@ static int ads1015_read_value(struct i2c_client *client,
unsigned int channel,
unsigned int k;
struct ads1015_data *data = i2c_get_clientdata(client);
int res;
+ int msec;
mutex_lock(&data->update_lock);
@@ -89,6 +96,13 @@ static int ads1015_read_value(struct i2c_client *client,
unsigned int channel,
pga = (config >> 9) & 0x0007;
fullscale = fullscale_table[pga];
+ /* for ADS1115, get the conversion time */
+ if(data->id == ads1115) {
+ msec = (config >> 5) & 0x0007;
+ msec = 128 >> msec;
+ }
+ else
+ msec = 1;
/* set channel and start single conversion */
config &= ~(0x0007 << 12);
config |= (1 << 15) | (1 << 8) | (channel & 0x0007) << 12;
@@ -98,7 +112,8 @@ static int ads1015_read_value(struct i2c_client *client,
unsigned int channel,
if (res < 0)
goto err_unlock;
for (k = 0; k < 5; ++k) {
- schedule_timeout(msecs_to_jiffies(1));
+ set_current_state(TASK_INTERRUPTIBLE);
+ schedule_timeout(msecs_to_jiffies(msec));
res = ads1015_read_reg(client, ADS1015_CONFIG);
if (res < 0)
goto err_unlock;
@@ -118,7 +133,10 @@ static int ads1015_read_value(struct i2c_client
*client, unsigned int channel,
mutex_unlock(&data->update_lock);
- *value = DIV_ROUND_CLOSEST(conversion * fullscale, 0x7ff0);
+ if(data->id == ads1115)
+ *value = DIV_ROUND_CLOSEST(conversion * fullscale, 0x7fff);
+ else
+ *value = DIV_ROUND_CLOSEST(conversion * fullscale, 0x7ff0);
return 0;
@@ -133,7 +151,7 @@ static ssize_t show_in(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);
- int in;
+ int in = 0;
int res;
res = ads1015_read_value(client, attr->index, &in);
@@ -239,7 +257,9 @@ static int ads1015_probe(struct i2c_client *client,
err = PTR_ERR(data->hwmon_dev);
goto exit_remove;
}
-
+
+ data->id = id->driver_data;
+
return 0;
exit_remove:
@@ -251,7 +271,8 @@ exit:
}
static const struct i2c_device_id ads1015_id[] = {
- { "ads1015", 0 },
+ { "ads1015", ads1015 },
+ { "ads1115", ads1115 },
{ }
};
MODULE_DEVICE_TABLE(i2c, ads1015_id);
<<<< END >>>>
_______________________________________________
lm-sensors mailing list
lm-sensors@xxxxxxxxxxxxxx
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
