ath10k: use num_pending_tx instead of msdu id bitmap
[cascardo/linux.git] / drivers / hwmon / lm73.c
index 7272176..9bde964 100644 (file)
@@ -8,6 +8,7 @@
  * Guillaume Ligneul <guillaume.ligneul@gmail.com>
  * Adrien Demarez <adrien.demarez@bolloretelecom.eu>
  * Jeremy Laine <jeremy.laine@bolloretelecom.eu>
+ * Chris Verges <kg4ysn@gmail.com>
  *
  * This software program is licensed subject to the GNU General Public License
  * (GPL).Version 2,June 1991, available at
@@ -36,11 +37,30 @@ static const unsigned short normal_i2c[] = { 0x48, 0x49, 0x4a, 0x4c,
 
 #define LM73_ID                        0x9001  /* 0x0190, byte-swapped */
 #define DRVNAME                        "lm73"
-#define LM73_TEMP_MIN          (-40)
-#define LM73_TEMP_MAX          150
+#define LM73_TEMP_MIN          (-256000 / 250)
+#define LM73_TEMP_MAX          (255750 / 250)
 
-/*-----------------------------------------------------------------------*/
+#define LM73_CTRL_RES_SHIFT    5
+#define LM73_CTRL_RES_MASK     (BIT(5) | BIT(6))
+#define LM73_CTRL_TO_MASK      BIT(7)
+
+#define LM73_CTRL_HI_SHIFT     2
+#define LM73_CTRL_LO_SHIFT     1
+
+static const unsigned short lm73_convrates[] = {
+       14,     /* 11-bits (0.25000 C/LSB): RES1 Bit = 0, RES0 Bit = 0 */
+       28,     /* 12-bits (0.12500 C/LSB): RES1 Bit = 0, RES0 Bit = 1 */
+       56,     /* 13-bits (0.06250 C/LSB): RES1 Bit = 1, RES0 Bit = 0 */
+       112,    /* 14-bits (0.03125 C/LSB): RES1 Bit = 1, RES0 Bit = 1 */
+};
 
+struct lm73_data {
+       struct device *hwmon_dev;
+       struct mutex lock;
+       u8 ctrl;                        /* control register value */
+};
+
+/*-----------------------------------------------------------------------*/
 
 static ssize_t set_temp(struct device *dev, struct device_attribute *da,
                        const char *buf, size_t count)
@@ -56,8 +76,7 @@ static ssize_t set_temp(struct device *dev, struct device_attribute *da,
                return status;
 
        /* Write value */
-       value = (short) SENSORS_LIMIT(temp/250, (LM73_TEMP_MIN*4),
-               (LM73_TEMP_MAX*4)) << 5;
+       value = clamp_val(temp / 250, LM73_TEMP_MIN, LM73_TEMP_MAX) << 5;
        err = i2c_smbus_write_word_swapped(client, attr->index, value);
        return (err < 0) ? err : count;
 }
@@ -79,6 +98,73 @@ static ssize_t show_temp(struct device *dev, struct device_attribute *da,
        return scnprintf(buf, PAGE_SIZE, "%d\n", temp);
 }
 
+static ssize_t set_convrate(struct device *dev, struct device_attribute *da,
+                           const char *buf, size_t count)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct lm73_data *data = i2c_get_clientdata(client);
+       unsigned long convrate;
+       s32 err;
+       int res = 0;
+
+       err = kstrtoul(buf, 10, &convrate);
+       if (err < 0)
+               return err;
+
+       /*
+        * Convert the desired conversion rate into register bits.
+        * res is already initialized, and everything past the second-to-last
+        * value in the array is treated as belonging to the last value
+        * in the array.
+        */
+       while (res < (ARRAY_SIZE(lm73_convrates) - 1) &&
+                       convrate > lm73_convrates[res])
+               res++;
+
+       mutex_lock(&data->lock);
+       data->ctrl &= LM73_CTRL_TO_MASK;
+       data->ctrl |= res << LM73_CTRL_RES_SHIFT;
+       err = i2c_smbus_write_byte_data(client, LM73_REG_CTRL, data->ctrl);
+       mutex_unlock(&data->lock);
+
+       if (err < 0)
+               return err;
+
+       return count;
+}
+
+static ssize_t show_convrate(struct device *dev, struct device_attribute *da,
+                            char *buf)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct lm73_data *data = i2c_get_clientdata(client);
+       int res;
+
+       res = (data->ctrl & LM73_CTRL_RES_MASK) >> LM73_CTRL_RES_SHIFT;
+       return scnprintf(buf, PAGE_SIZE, "%hu\n", lm73_convrates[res]);
+}
+
+static ssize_t show_maxmin_alarm(struct device *dev,
+                                struct device_attribute *da, char *buf)
+{
+       struct i2c_client *client = to_i2c_client(dev);
+       struct sensor_device_attribute *attr = to_sensor_dev_attr(da);
+       struct lm73_data *data = i2c_get_clientdata(client);
+       s32 ctrl;
+
+       mutex_lock(&data->lock);
+       ctrl = i2c_smbus_read_byte_data(client, LM73_REG_CTRL);
+       if (ctrl < 0)
+               goto abort;
+       data->ctrl = ctrl;
+       mutex_unlock(&data->lock);
+
+       return scnprintf(buf, PAGE_SIZE, "%d\n", (ctrl >> attr->index) & 1);
+
+abort:
+       mutex_unlock(&data->lock);
+       return ctrl;
+}
 
 /*-----------------------------------------------------------------------*/
 
@@ -90,13 +176,20 @@ static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO,
                        show_temp, set_temp, LM73_REG_MIN);
 static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO,
                        show_temp, NULL, LM73_REG_INPUT);
-
+static SENSOR_DEVICE_ATTR(update_interval, S_IWUSR | S_IRUGO,
+                       show_convrate, set_convrate, 0);
+static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO,
+                       show_maxmin_alarm, NULL, LM73_CTRL_HI_SHIFT);
+static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO,
+                       show_maxmin_alarm, NULL, LM73_CTRL_LO_SHIFT);
 
 static struct attribute *lm73_attributes[] = {
        &sensor_dev_attr_temp1_input.dev_attr.attr,
        &sensor_dev_attr_temp1_max.dev_attr.attr,
        &sensor_dev_attr_temp1_min.dev_attr.attr,
-
+       &sensor_dev_attr_update_interval.dev_attr.attr,
+       &sensor_dev_attr_temp1_max_alarm.dev_attr.attr,
+       &sensor_dev_attr_temp1_min_alarm.dev_attr.attr,
        NULL
 };
 
@@ -111,23 +204,36 @@ static const struct attribute_group lm73_group = {
 static int
 lm73_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
-       struct device *hwmon_dev;
        int status;
+       struct lm73_data *data;
+       int ctrl;
+
+       data = devm_kzalloc(&client->dev, sizeof(struct lm73_data),
+                           GFP_KERNEL);
+       if (!data)
+               return -ENOMEM;
+
+       i2c_set_clientdata(client, data);
+       mutex_init(&data->lock);
+
+       ctrl = i2c_smbus_read_byte_data(client, LM73_REG_CTRL);
+       if (ctrl < 0)
+               return ctrl;
+       data->ctrl = ctrl;
 
        /* Register sysfs hooks */
        status = sysfs_create_group(&client->dev.kobj, &lm73_group);
        if (status)
                return status;
 
-       hwmon_dev = hwmon_device_register(&client->dev);
-       if (IS_ERR(hwmon_dev)) {
-               status = PTR_ERR(hwmon_dev);
+       data->hwmon_dev = hwmon_device_register(&client->dev);
+       if (IS_ERR(data->hwmon_dev)) {
+               status = PTR_ERR(data->hwmon_dev);
                goto exit_remove;
        }
-       i2c_set_clientdata(client, hwmon_dev);
 
        dev_info(&client->dev, "%s: sensor '%s'\n",
-                dev_name(hwmon_dev), client->name);
+                dev_name(data->hwmon_dev), client->name);
 
        return 0;
 
@@ -138,9 +244,9 @@ exit_remove:
 
 static int lm73_remove(struct i2c_client *client)
 {
-       struct device *hwmon_dev = i2c_get_clientdata(client);
+       struct lm73_data *data = i2c_get_clientdata(client);
 
-       hwmon_device_unregister(hwmon_dev);
+       hwmon_device_unregister(data->hwmon_dev);
        sysfs_remove_group(&client->dev.kobj, &lm73_group);
        return 0;
 }