Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 960f12f4d1eb5ba3c76dc6b57a909a65dd59e1c2

Authored by Alan Cox
Committed by Jean Delvare
1 parent 5950ec8d3e
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

hwmon: (emc1403) Add power support 

Add back the power interface we lost due to a slight misunderstanding of
the maintainers wishes.

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Jean Delvare <khali@linux-fr.org>

Showing 1 changed file with 33 additions and 0 deletions Side-by-side Diff

drivers/hwmon/emc1403.c
Diff comments   View file @ 960f12f
... ... @@ -89,6 +89,35 @@
89 89 return count;
90 90 }
91 91  
  92 +static ssize_t store_bit(struct device *dev,
  93 + struct device_attribute *attr, const char *buf, size_t count)
  94 +{
  95 + struct i2c_client *client = to_i2c_client(dev);
  96 + struct thermal_data *data = i2c_get_clientdata(client);
  97 + struct sensor_device_attribute_2 *sda = to_sensor_dev_attr_2(attr);
  98 + unsigned long val;
  99 + int retval;
  100 +
  101 + if (strict_strtoul(buf, 10, &val))
  102 + return -EINVAL;
  103 +
  104 + mutex_lock(&data->mutex);
  105 + retval = i2c_smbus_read_byte_data(client, sda->nr);
  106 + if (retval < 0)
  107 + goto fail;
  108 +
  109 + retval &= ~sda->index;
  110 + if (val)
  111 + retval |= sda->index;
  112 +
  113 + retval = i2c_smbus_write_byte_data(client, sda->index, retval);
  114 + if (retval == 0)
  115 + retval = count;
  116 +fail:
  117 + mutex_unlock(&data->mutex);
  118 + return retval;
  119 +}
  120 +
92 121 static ssize_t show_hyst(struct device *dev,
93 122 struct device_attribute *attr, char *buf)
94 123 {
... ... @@ -200,6 +229,9 @@
200 229 static SENSOR_DEVICE_ATTR(temp3_crit_hyst, S_IRUGO | S_IWUSR,
201 230 show_hyst, store_hyst, 0x1A);
202 231  
  232 +static SENSOR_DEVICE_ATTR_2(power_state, S_IRUGO | S_IWUSR,
  233 + show_bit, store_bit, 0x03, 0x40);
  234 +
203 235 static struct attribute *mid_att_thermal[] = {
204 236 &sensor_dev_attr_temp1_min.dev_attr.attr,
205 237 &sensor_dev_attr_temp1_max.dev_attr.attr,
... ... @@ -225,6 +257,7 @@
225 257 &sensor_dev_attr_temp3_max_alarm.dev_attr.attr,
226 258 &sensor_dev_attr_temp3_crit_alarm.dev_attr.attr,
227 259 &sensor_dev_attr_temp3_crit_hyst.dev_attr.attr,
  260 + &sensor_dev_attr_power_state.dev_attr.attr,
228 261 NULL
229 262 };
230 263