Lars-Peter Clausen schrieb: > The adt7310/adt7320 is the SPI version of the adt7410/adt7420. The register map > layout is a bit different, i.e. the register addresses differ between the two > variants, but the bit layouts of the individual registers are identical. So both > chip variants can easily be supported by the same driver. The issue of non > matching register address layouts is solved by a simple look-up table which > translates the I2C addresses to the SPI addresses. > > The patch moves the bulk of the adt7410 driver to a common module that will be > shared by the adt7410 and adt7310 drivers. This common module implements the > driver logic and uses a set of virtual functions to perform IO access. The > adt7410 and adt7310 driver modules provide proper implementations of these IO > accessor functions for I2C respective SPI. > > Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> Reviewed-by: Hartmut Knaack <knaack.h@xxxxxx> > > --- > Changes since v2: > * Prefix identifiers and defines in the common code with adt7x10 instead of > adt7410 > * Minor code style cleanups > * Typo fixes for the description in Documentation/ > Changes since v1: > * Update the driver documentation to include ADT7310/ADT7320/ADT7420 > * Pass the result of the read methods via the return value instead of a > pointer argument > * Simplify spi read methods by using spi_w8r8 and spi_w8r16 > * Update module description of the shared module > * Fix some typos > > Signed-off-by: Lars-Peter Clausen <lars@xxxxxxxxxx> > --- > Documentation/hwmon/adt7410 | 47 +++-- > drivers/hwmon/Kconfig | 20 ++ > drivers/hwmon/Makefile | 2 + > drivers/hwmon/adt7310.c | 123 ++++++++++++ > drivers/hwmon/adt7410.c | 467 +++---------------------------------------- > drivers/hwmon/adt7x10.c | 476 ++++++++++++++++++++++++++++++++++++++++++++ > drivers/hwmon/adt7x10.h | 37 ++++ > 7 files changed, 719 insertions(+), 453 deletions(-) > create mode 100644 drivers/hwmon/adt7310.c > create mode 100644 drivers/hwmon/adt7x10.c > create mode 100644 drivers/hwmon/adt7x10.h > > diff --git a/Documentation/hwmon/adt7410 b/Documentation/hwmon/adt7410 > index 58150c4..9817941 100644 > --- a/Documentation/hwmon/adt7410 > +++ b/Documentation/hwmon/adt7410 > @@ -12,29 +12,42 @@ Supported chips: > Addresses scanned: None > Datasheet: Publicly available at the Analog Devices website > http://www.analog.com/static/imported-files/data_sheets/ADT7420.pdf > + * Analog Devices ADT7310 > + Prefix: 'adt7310' > + Addresses scanned: None > + Datasheet: Publicly available at the Analog Devices website > + http://www.analog.com/static/imported-files/data_sheets/ADT7310.pdf > + * Analog Devices ADT7320 > + Prefix: 'adt7320' > + Addresses scanned: None > + Datasheet: Publicly available at the Analog Devices website > + http://www.analog.com/static/imported-files/data_sheets/ADT7320.pdf > > Author: Hartmut Knaack <knaack.h@xxxxxx> > > Description > ----------- > > -The ADT7410 is a temperature sensor with rated temperature range of -55°C to > -+150°C. It has a high accuracy of +/-0.5°C and can be operated at a resolution > -of 13 bits (0.0625°C) or 16 bits (0.0078°C). The sensor provides an INT pin to > -indicate that a minimum or maximum temperature set point has been exceeded, as > -well as a critical temperature (CT) pin to indicate that the critical > -temperature set point has been exceeded. Both pins can be set up with a common > -hysteresis of 0°C - 15°C and a fault queue, ranging from 1 to 4 events. Both > -pins can individually set to be active-low or active-high, while the whole > -device can either run in comparator mode or interrupt mode. The ADT7410 > -supports continous temperature sampling, as well as sampling one temperature > -value per second or even justget one sample on demand for power saving. > -Besides, it can completely power down its ADC, if power management is > -required. > - > -The ADT7420 is register compatible, the only differences being the package, > -a slightly narrower operating temperature range (-40°C to +150°C), and a > -better accuracy (0.25°C instead of 0.50°C.) > +The ADT7310/ADT7410 is a temperature sensor with rated temperature range of > +-55°C to +150°C. It has a high accuracy of +/-0.5°C and can be operated at a > +resolution of 13 bits (0.0625°C) or 16 bits (0.0078°C). The sensor provides an > +INT pin to indicate that a minimum or maximum temperature set point has been > +exceeded, as well as a critical temperature (CT) pin to indicate that the > +critical temperature set point has been exceeded. Both pins can be set up with a > +common hysteresis of 0°C - 15°C and a fault queue, ranging from 1 to 4 events. > +Both pins can individually set to be active-low or active-high, while the whole > +device can either run in comparator mode or interrupt mode. The ADT7410 supports > +continuous temperature sampling, as well as sampling one temperature value per > +second or even just get one sample on demand for power saving. Besides, it can > +completely power down its ADC, if power management is required. > + > +The ADT7320/ADT7420 is register compatible, the only differences being the > +package, a slightly narrower operating temperature range (-40°C to +150°C), and > +a better accuracy (0.25°C instead of 0.50°C.) > + > +The difference between the ADT7310/ADT7320 and ADT7410/ADT7420 is the control > +interface, the ADT7310 and ADT7320 use SPI while the ADT7410 and ADT7420 use > +I2C. > > Configuration Notes > ------------------- > diff --git a/drivers/hwmon/Kconfig b/drivers/hwmon/Kconfig > index 89ac1cb..aaa14f4 100644 > --- a/drivers/hwmon/Kconfig > +++ b/drivers/hwmon/Kconfig > @@ -179,9 +179,29 @@ config SENSORS_ADM9240 > This driver can also be built as a module. If so, the module > will be called adm9240. > > +config SENSORS_ADT7X10 > + tristate > + help > + This module contains common code shared by the ADT7310/ADT7320 and > + ADT7410/ADT7420 temperature monitoring chip drivers. > + > + If build as a module, the module will be called adt7x10. > + > +config SENSORS_ADT7310 > + tristate "Analog Devices ADT7310/ADT7320" > + depends on SPI_MASTER > + select SENSORS_ADT7X10 > + help > + If you say yes here you get support for the Analog Devices > + ADT7310 and ADT7320 temperature monitoring chips. > + > + This driver can also be built as a module. If so, the module > + will be called adt7310. > + > config SENSORS_ADT7410 > tristate "Analog Devices ADT7410/ADT7420" > depends on I2C > + select SENSORS_ADT7X10 > help > If you say yes here you get support for the Analog Devices > ADT7410 and ADT7420 temperature monitoring chips. > diff --git a/drivers/hwmon/Makefile b/drivers/hwmon/Makefile > index 8d6d97e..5d36a57 100644 > --- a/drivers/hwmon/Makefile > +++ b/drivers/hwmon/Makefile > @@ -34,6 +34,8 @@ obj-$(CONFIG_SENSORS_ADM9240) += adm9240.o > obj-$(CONFIG_SENSORS_ADS1015) += ads1015.o > obj-$(CONFIG_SENSORS_ADS7828) += ads7828.o > obj-$(CONFIG_SENSORS_ADS7871) += ads7871.o > +obj-$(CONFIG_SENSORS_ADT7X10) += adt7x10.o > +obj-$(CONFIG_SENSORS_ADT7310) += adt7310.o > obj-$(CONFIG_SENSORS_ADT7410) += adt7410.o > obj-$(CONFIG_SENSORS_ADT7411) += adt7411.o > obj-$(CONFIG_SENSORS_ADT7462) += adt7462.o > diff --git a/drivers/hwmon/adt7310.c b/drivers/hwmon/adt7310.c > new file mode 100644 > index 0000000..f8ea629 > --- /dev/null > +++ b/drivers/hwmon/adt7310.c > @@ -0,0 +1,123 @@ > +/* > + * ADT7310/ADT7310 digital temperature sensor driver > + * > + * Copyright 2012-2013 Analog Devices Inc. > + * Author: Lars-Peter Clausen <lars@xxxxxxxxxx> > + * > + * Licensed under the GPL-2 or later. > + */ > + > +#include <linux/module.h> > +#include <linux/init.h> > +#include <linux/spi/spi.h> > +#include <asm/unaligned.h> > + > +#include "adt7x10.h" > + > +#define ADT7310_STATUS 0 > +#define ADT7310_CONFIG 1 > +#define ADT7310_TEMPERATURE 2 > +#define ADT7310_ID 3 > +#define ADT7310_T_CRIT 4 > +#define ADT7310_T_HYST 5 > +#define ADT7310_T_ALARM_HIGH 6 > +#define ADT7310_T_ALARM_LOW 7 > + > +static const u8 adt7310_reg_table[] = { > + [ADT7X10_TEMPERATURE] = ADT7310_TEMPERATURE, > + [ADT7X10_STATUS] = ADT7310_STATUS, > + [ADT7X10_CONFIG] = ADT7310_CONFIG, > + [ADT7X10_T_ALARM_HIGH] = ADT7310_T_ALARM_HIGH, > + [ADT7X10_T_ALARM_LOW] = ADT7310_T_ALARM_LOW, > + [ADT7X10_T_CRIT] = ADT7310_T_CRIT, > + [ADT7X10_T_HYST] = ADT7310_T_HYST, > + [ADT7X10_ID] = ADT7310_ID, > +}; > + > +#define ADT7310_CMD_REG_OFFSET 3 > +#define ADT7310_CMD_READ 0x40 > + > +#define AD7310_COMMAND(reg) (adt7310_reg_table[(reg)] << ADT7310_CMD_REG_OFFSET) > + > +static int adt7310_spi_read_word(struct device *dev, u8 reg) > +{ > + struct spi_device *spi = to_spi_device(dev); > + int ret; > + > + ret = spi_w8r16(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); > + if (ret < 0) > + return ret; > + > + return be16_to_cpu(ret); > +} > + > +static int adt7310_spi_write_word(struct device *dev, u8 reg, u16 data) > +{ > + struct spi_device *spi = to_spi_device(dev); > + u8 buf[3]; > + > + buf[0] = AD7310_COMMAND(reg); > + put_unaligned_be16(data, &buf[1]); > + > + return spi_write(spi, buf, sizeof(buf)); > +} > + > +static int adt7310_spi_read_byte(struct device *dev, u8 reg) > +{ > + struct spi_device *spi = to_spi_device(dev); > + > + return spi_w8r8(spi, AD7310_COMMAND(reg) | ADT7310_CMD_READ); > +} > + > +static int adt7310_spi_write_byte(struct device *dev, u8 reg, > + u8 data) > +{ > + struct spi_device *spi = to_spi_device(dev); > + u8 buf[2]; > + > + buf[0] = AD7310_COMMAND(reg); > + buf[1] = data; > + > + return spi_write(spi, buf, sizeof(buf)); > +} > + > +static const struct adt7x10_ops adt7310_spi_ops = { > + .read_word = adt7310_spi_read_word, > + .write_word = adt7310_spi_write_word, > + .read_byte = adt7310_spi_read_byte, > + .write_byte = adt7310_spi_write_byte, > +}; > + > +static int adt7310_spi_probe(struct spi_device *spi) > +{ > + return adt7x10_probe(&spi->dev, spi_get_device_id(spi)->name, > + &adt7310_spi_ops); > +} > + > +static int adt7310_spi_remove(struct spi_device *spi) > +{ > + return adt7x10_remove(&spi->dev); > +} > + > +static const struct spi_device_id adt7310_id[] = { > + { "adt7310", 0 }, > + { "adt7320", 0 }, > + {} > +}; > +MODULE_DEVICE_TABLE(spi, adt7310_id); > + > +static struct spi_driver adt7310_driver = { > + .driver = { > + .name = "adt7310", > + .owner = THIS_MODULE, > + .pm = ADT7X10_DEV_PM_OPS, > + }, > + .probe = adt7310_spi_probe, > + .remove = adt7310_spi_remove, > + .id_table = adt7310_id, > +}; > +module_spi_driver(adt7310_driver); > + > +MODULE_AUTHOR("Lars-Peter Clausen <lars@xxxxxxxxxx>"); > +MODULE_DESCRIPTION("ADT7310/ADT7320 driver"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/hwmon/adt7410.c b/drivers/hwmon/adt7410.c > index 894ff71..d294445 100644 > --- a/drivers/hwmon/adt7410.c > +++ b/drivers/hwmon/adt7410.c > @@ -1,485 +1,80 @@ > /* > - * adt7410.c - Part of lm_sensors, Linux kernel modules for hardware > - * monitoring > - * This driver handles the ADT7410 and compatible digital temperature sensors. > - * Hartmut Knaack <knaack.h@xxxxxx> 2012-07-22 > - * based on lm75.c by Frodo Looijaard <frodol@xxxxxx> > - * and adt7410.c from iio-staging by Sonic Zhang <sonic.zhang@xxxxxxxxxx> > + * ADT7410/ADT7420 digital temperature sensor driver > * > - * 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. > + * Copyright 2012-2013 Analog Devices Inc. > + * Author: Lars-Peter Clausen <lars@xxxxxxxxxx> > * > - * 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. > + * Licensed under the GPL-2 or later. > */ > > #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/delay.h> > - > -/* > - * ADT7410 registers definition > - */ > - > -#define ADT7410_TEMPERATURE 0 > -#define ADT7410_STATUS 2 > -#define ADT7410_CONFIG 3 > -#define ADT7410_T_ALARM_HIGH 4 > -#define ADT7410_T_ALARM_LOW 6 > -#define ADT7410_T_CRIT 8 > -#define ADT7410_T_HYST 0xA > - > -/* > - * ADT7410 status > - */ > -#define ADT7410_STAT_T_LOW (1 << 4) > -#define ADT7410_STAT_T_HIGH (1 << 5) > -#define ADT7410_STAT_T_CRIT (1 << 6) > -#define ADT7410_STAT_NOT_RDY (1 << 7) > - > -/* > - * ADT7410 config > - */ > -#define ADT7410_FAULT_QUEUE_MASK (1 << 0 | 1 << 1) > -#define ADT7410_CT_POLARITY (1 << 2) > -#define ADT7410_INT_POLARITY (1 << 3) > -#define ADT7410_EVENT_MODE (1 << 4) > -#define ADT7410_MODE_MASK (1 << 5 | 1 << 6) > -#define ADT7410_FULL (0 << 5 | 0 << 6) > -#define ADT7410_PD (1 << 5 | 1 << 6) > -#define ADT7410_RESOLUTION (1 << 7) > - > -/* > - * ADT7410 masks > - */ > -#define ADT7410_T13_VALUE_MASK 0xFFF8 > -#define ADT7410_T_HYST_MASK 0xF > - > -/* straight from the datasheet */ > -#define ADT7410_TEMP_MIN (-55000) > -#define ADT7410_TEMP_MAX 150000 > - > -enum adt7410_type { /* keep sorted in alphabetical order */ > - adt7410, > -}; > - > -static const u8 ADT7410_REG_TEMP[4] = { > - ADT7410_TEMPERATURE, /* input */ > - ADT7410_T_ALARM_HIGH, /* high */ > - ADT7410_T_ALARM_LOW, /* low */ > - ADT7410_T_CRIT, /* critical */ > -}; > - > -/* Each client has this additional data */ > -struct adt7410_data { > - struct device *hwmon_dev; > - struct mutex update_lock; > - u8 config; > - u8 oldconfig; > - bool valid; /* true if registers valid */ > - unsigned long last_updated; /* In jiffies */ > - s16 temp[4]; /* Register values, > - 0 = input > - 1 = high > - 2 = low > - 3 = critical */ > - u8 hyst; /* hysteresis offset */ > -}; > - > -/* > - * adt7410 register access by I2C > - */ > -static int adt7410_temp_ready(struct i2c_client *client) > -{ > - int i, status; > - > - for (i = 0; i < 6; i++) { > - status = i2c_smbus_read_byte_data(client, ADT7410_STATUS); > - if (status < 0) > - return status; > - if (!(status & ADT7410_STAT_NOT_RDY)) > - return 0; > - msleep(60); > - } > - return -ETIMEDOUT; > -} > - > -static int adt7410_update_temp(struct device *dev) > -{ > - struct i2c_client *client = to_i2c_client(dev); > - struct adt7410_data *data = i2c_get_clientdata(client); > - int ret = 0; > - > - mutex_lock(&data->update_lock); > - > - if (time_after(jiffies, data->last_updated + HZ + HZ / 2) > - || !data->valid) { > - int temp; > - > - dev_dbg(&client->dev, "Starting update\n"); > - > - ret = adt7410_temp_ready(client); /* check for new value */ > - if (ret) > - goto abort; > - > - temp = i2c_smbus_read_word_swapped(client, ADT7410_REG_TEMP[0]); > - if (temp < 0) { > - ret = temp; > - dev_dbg(dev, "Failed to read value: reg %d, error %d\n", > - ADT7410_REG_TEMP[0], ret); > - goto abort; > - } > - data->temp[0] = temp; > - > - data->last_updated = jiffies; > - data->valid = true; > - } > - > -abort: > - mutex_unlock(&data->update_lock); > - return ret; > -} > - > -static int adt7410_fill_cache(struct i2c_client *client) > -{ > - struct adt7410_data *data = i2c_get_clientdata(client); > - int ret; > - int i; > - > - for (i = 1; i < ARRAY_SIZE(ADT7410_REG_TEMP); i++) { > - ret = i2c_smbus_read_word_swapped(client, ADT7410_REG_TEMP[i]); > - if (ret < 0) { > - dev_dbg(&client->dev, > - "Failed to read value: reg %d, error %d\n", > - ADT7410_REG_TEMP[i], ret); > - return ret; > - } > - data->temp[i] = ret; > - } > - > - ret = i2c_smbus_read_byte_data(client, ADT7410_T_HYST); > - if (ret < 0) { > - dev_dbg(&client->dev, > - "Failed to read value: hyst reg, error %d\n", > - ret); > - return ret; > - } > - data->hyst = ret; > - > - return 0; > -} > - > -static s16 ADT7410_TEMP_TO_REG(long temp) > -{ > - return DIV_ROUND_CLOSEST(clamp_val(temp, ADT7410_TEMP_MIN, > - ADT7410_TEMP_MAX) * 128, 1000); > -} > - > -static int ADT7410_REG_TO_TEMP(struct adt7410_data *data, s16 reg) > -{ > - /* in 13 bit mode, bits 0-2 are status flags - mask them out */ > - if (!(data->config & ADT7410_RESOLUTION)) > - reg &= ADT7410_T13_VALUE_MASK; > - /* > - * temperature is stored in twos complement format, in steps of > - * 1/128°C > - */ > - return DIV_ROUND_CLOSEST(reg * 1000, 128); > -} > - > -/*-----------------------------------------------------------------------*/ > > -/* sysfs attributes for hwmon */ > +#include "adt7x10.h" > > -static ssize_t adt7410_show_temp(struct device *dev, > - struct device_attribute *da, char *buf) > +static int adt7410_i2c_read_word(struct device *dev, u8 reg) > { > - struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > - struct i2c_client *client = to_i2c_client(dev); > - struct adt7410_data *data = i2c_get_clientdata(client); > - > - if (attr->index == 0) { > - int ret; > - > - ret = adt7410_update_temp(dev); > - if (ret) > - return ret; > - } > - > - return sprintf(buf, "%d\n", ADT7410_REG_TO_TEMP(data, > - data->temp[attr->index])); > + return i2c_smbus_read_word_swapped(to_i2c_client(dev), reg); > } > > -static ssize_t adt7410_set_temp(struct device *dev, > - struct device_attribute *da, > - const char *buf, size_t count) > +static int adt7410_i2c_write_word(struct device *dev, u8 reg, u16 data) > { > - struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > - struct i2c_client *client = to_i2c_client(dev); > - struct adt7410_data *data = i2c_get_clientdata(client); > - int nr = attr->index; > - long temp; > - int ret; > - > - ret = kstrtol(buf, 10, &temp); > - if (ret) > - return ret; > - > - mutex_lock(&data->update_lock); > - data->temp[nr] = ADT7410_TEMP_TO_REG(temp); > - ret = i2c_smbus_write_word_swapped(client, ADT7410_REG_TEMP[nr], > - data->temp[nr]); > - if (ret) > - count = ret; > - mutex_unlock(&data->update_lock); > - return count; > + return i2c_smbus_write_word_swapped(to_i2c_client(dev), reg, data); > } > > -static ssize_t adt7410_show_t_hyst(struct device *dev, > - struct device_attribute *da, > - char *buf) > +static int adt7410_i2c_read_byte(struct device *dev, u8 reg) > { > - struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > - struct i2c_client *client = to_i2c_client(dev); > - struct adt7410_data *data = i2c_get_clientdata(client); > - int nr = attr->index; > - int hyst; > - > - hyst = (data->hyst & ADT7410_T_HYST_MASK) * 1000; > - > - /* > - * hysteresis is stored as a 4 bit offset in the device, convert it > - * to an absolute value > - */ > - if (nr == 2) /* min has positive offset, others have negative */ > - hyst = -hyst; > - return sprintf(buf, "%d\n", > - ADT7410_REG_TO_TEMP(data, data->temp[nr]) - hyst); > + return i2c_smbus_read_byte_data(to_i2c_client(dev), reg); > } > > -static ssize_t adt7410_set_t_hyst(struct device *dev, > - struct device_attribute *da, > - const char *buf, size_t count) > +static int adt7410_i2c_write_byte(struct device *dev, u8 reg, u8 data) > { > - struct i2c_client *client = to_i2c_client(dev); > - struct adt7410_data *data = i2c_get_clientdata(client); > - int limit, ret; > - long hyst; > - > - ret = kstrtol(buf, 10, &hyst); > - if (ret) > - return ret; > - /* convert absolute hysteresis value to a 4 bit delta value */ > - limit = ADT7410_REG_TO_TEMP(data, data->temp[1]); > - hyst = clamp_val(hyst, ADT7410_TEMP_MIN, ADT7410_TEMP_MAX); > - data->hyst = clamp_val(DIV_ROUND_CLOSEST(limit - hyst, 1000), 0, > - ADT7410_T_HYST_MASK); > - ret = i2c_smbus_write_byte_data(client, ADT7410_T_HYST, data->hyst); > - if (ret) > - return ret; > - > - return count; > + return i2c_smbus_write_byte_data(to_i2c_client(dev), reg, data); > } > > -static ssize_t adt7410_show_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); > - int ret; > - > - ret = i2c_smbus_read_byte_data(client, ADT7410_STATUS); > - if (ret < 0) > - return ret; > - > - return sprintf(buf, "%d\n", !!(ret & attr->index)); > -} > - > -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, adt7410_show_temp, NULL, 0); > -static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, > - adt7410_show_temp, adt7410_set_temp, 1); > -static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, > - adt7410_show_temp, adt7410_set_temp, 2); > -static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, > - adt7410_show_temp, adt7410_set_temp, 3); > -static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO, > - adt7410_show_t_hyst, adt7410_set_t_hyst, 1); > -static SENSOR_DEVICE_ATTR(temp1_min_hyst, S_IRUGO, > - adt7410_show_t_hyst, NULL, 2); > -static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, > - adt7410_show_t_hyst, NULL, 3); > -static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, adt7410_show_alarm, > - NULL, ADT7410_STAT_T_LOW); > -static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, adt7410_show_alarm, > - NULL, ADT7410_STAT_T_HIGH); > -static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, adt7410_show_alarm, > - NULL, ADT7410_STAT_T_CRIT); > - > -static struct attribute *adt7410_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_temp1_crit.dev_attr.attr, > - &sensor_dev_attr_temp1_max_hyst.dev_attr.attr, > - &sensor_dev_attr_temp1_min_hyst.dev_attr.attr, > - &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr, > - &sensor_dev_attr_temp1_min_alarm.dev_attr.attr, > - &sensor_dev_attr_temp1_max_alarm.dev_attr.attr, > - &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr, > - NULL > +static const struct adt7x10_ops adt7410_i2c_ops = { > + .read_word = adt7410_i2c_read_word, > + .write_word = adt7410_i2c_write_word, > + .read_byte = adt7410_i2c_read_byte, > + .write_byte = adt7410_i2c_write_byte, > }; > > -static const struct attribute_group adt7410_group = { > - .attrs = adt7410_attributes, > -}; > - > -/*-----------------------------------------------------------------------*/ > - > -/* device probe and removal */ > - > -static int adt7410_probe(struct i2c_client *client, > - const struct i2c_device_id *id) > +static int adt7410_i2c_probe(struct i2c_client *client, > + const struct i2c_device_id *id) > { > - struct adt7410_data *data; > - int ret; > - > if (!i2c_check_functionality(client->adapter, > I2C_FUNC_SMBUS_BYTE_DATA | I2C_FUNC_SMBUS_WORD_DATA)) > return -ENODEV; > > - data = devm_kzalloc(&client->dev, sizeof(struct adt7410_data), > - GFP_KERNEL); > - if (!data) > - return -ENOMEM; > - > - i2c_set_clientdata(client, data); > - mutex_init(&data->update_lock); > - > - /* configure as specified */ > - ret = i2c_smbus_read_byte_data(client, ADT7410_CONFIG); > - if (ret < 0) { > - dev_dbg(&client->dev, "Can't read config? %d\n", ret); > - return ret; > - } > - data->oldconfig = ret; > - /* > - * Set to 16 bit resolution, continous conversion and comparator mode. > - */ > - ret &= ~ADT7410_MODE_MASK; > - data->config = ret | ADT7410_FULL | ADT7410_RESOLUTION | > - ADT7410_EVENT_MODE; > - if (data->config != data->oldconfig) { > - ret = i2c_smbus_write_byte_data(client, ADT7410_CONFIG, > - data->config); > - if (ret) > - return ret; > - } > - dev_dbg(&client->dev, "Config %02x\n", data->config); > - > - ret = adt7410_fill_cache(client); > - if (ret) > - goto exit_restore; > - > - /* Register sysfs hooks */ > - ret = sysfs_create_group(&client->dev.kobj, &adt7410_group); > - if (ret) > - goto exit_restore; > - > - data->hwmon_dev = hwmon_device_register(&client->dev); > - if (IS_ERR(data->hwmon_dev)) { > - ret = PTR_ERR(data->hwmon_dev); > - goto exit_remove; > - } > - > - dev_info(&client->dev, "sensor '%s'\n", client->name); > - > - return 0; > - > -exit_remove: > - sysfs_remove_group(&client->dev.kobj, &adt7410_group); > -exit_restore: > - i2c_smbus_write_byte_data(client, ADT7410_CONFIG, data->oldconfig); > - return ret; > + return adt7x10_probe(&client->dev, NULL, &adt7410_i2c_ops); > } > > -static int adt7410_remove(struct i2c_client *client) > +static int adt7410_i2c_remove(struct i2c_client *client) > { > - struct adt7410_data *data = i2c_get_clientdata(client); > - > - hwmon_device_unregister(data->hwmon_dev); > - sysfs_remove_group(&client->dev.kobj, &adt7410_group); > - if (data->oldconfig != data->config) > - i2c_smbus_write_byte_data(client, ADT7410_CONFIG, > - data->oldconfig); > - return 0; > + return adt7x10_remove(&client->dev); > } > > static const struct i2c_device_id adt7410_ids[] = { > - { "adt7410", adt7410, }, > - { "adt7420", adt7410, }, > - { /* LIST END */ } > + { "adt7410", 0 }, > + { "adt7420", 0 }, > + {} > }; > MODULE_DEVICE_TABLE(i2c, adt7410_ids); > > -#ifdef CONFIG_PM_SLEEP > -static int adt7410_suspend(struct device *dev) > -{ > - int ret; > - struct i2c_client *client = to_i2c_client(dev); > - struct adt7410_data *data = i2c_get_clientdata(client); > - > - ret = i2c_smbus_write_byte_data(client, ADT7410_CONFIG, > - data->config | ADT7410_PD); > - return ret; > -} > - > -static int adt7410_resume(struct device *dev) > -{ > - int ret; > - struct i2c_client *client = to_i2c_client(dev); > - struct adt7410_data *data = i2c_get_clientdata(client); > - > - ret = i2c_smbus_write_byte_data(client, ADT7410_CONFIG, data->config); > - return ret; > -} > - > -static SIMPLE_DEV_PM_OPS(adt7410_dev_pm_ops, adt7410_suspend, adt7410_resume); > - > -#define ADT7410_DEV_PM_OPS (&adt7410_dev_pm_ops) > -#else > -#define ADT7410_DEV_PM_OPS NULL > -#endif /* CONFIG_PM */ > - > static struct i2c_driver adt7410_driver = { > .class = I2C_CLASS_HWMON, > .driver = { > .name = "adt7410", > - .pm = ADT7410_DEV_PM_OPS, > + .pm = ADT7X10_DEV_PM_OPS, > }, > - .probe = adt7410_probe, > - .remove = adt7410_remove, > + .probe = adt7410_i2c_probe, > + .remove = adt7410_i2c_remove, > .id_table = adt7410_ids, > .address_list = I2C_ADDRS(0x48, 0x49, 0x4a, 0x4b), > }; > - > module_i2c_driver(adt7410_driver); > > -MODULE_AUTHOR("Hartmut Knaack"); > -MODULE_DESCRIPTION("ADT7410/ADT7420 driver"); > +MODULE_AUTHOR("Lars-Peter Clausen <lars@xxxxxxxxxx>"); > +MODULE_DESCRIPTION("ADT7410/AD7420 driver"); > MODULE_LICENSE("GPL"); > diff --git a/drivers/hwmon/adt7x10.c b/drivers/hwmon/adt7x10.c > new file mode 100644 > index 0000000..84b3dfc > --- /dev/null > +++ b/drivers/hwmon/adt7x10.c > @@ -0,0 +1,476 @@ > +/* > + * adt7x10.c - Part of lm_sensors, Linux kernel modules for hardware > + * monitoring > + * This driver handles the ADT7410 and compatible digital temperature sensors. > + * Hartmut Knaack <knaack.h@xxxxxx> 2012-07-22 > + * based on lm75.c by Frodo Looijaard <frodol@xxxxxx> > + * and adt7410.c from iio-staging by Sonic Zhang <sonic.zhang@xxxxxxxxxx> > + * > + * 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/hwmon.h> > +#include <linux/hwmon-sysfs.h> > +#include <linux/err.h> > +#include <linux/mutex.h> > +#include <linux/delay.h> > + > +#include "adt7x10.h" > + > +/* > + * ADT7X10 status > + */ > +#define ADT7X10_STAT_T_LOW (1 << 4) > +#define ADT7X10_STAT_T_HIGH (1 << 5) > +#define ADT7X10_STAT_T_CRIT (1 << 6) > +#define ADT7X10_STAT_NOT_RDY (1 << 7) > + > +/* > + * ADT7X10 config > + */ > +#define ADT7X10_FAULT_QUEUE_MASK (1 << 0 | 1 << 1) > +#define ADT7X10_CT_POLARITY (1 << 2) > +#define ADT7X10_INT_POLARITY (1 << 3) > +#define ADT7X10_EVENT_MODE (1 << 4) > +#define ADT7X10_MODE_MASK (1 << 5 | 1 << 6) > +#define ADT7X10_FULL (0 << 5 | 0 << 6) > +#define ADT7X10_PD (1 << 5 | 1 << 6) > +#define ADT7X10_RESOLUTION (1 << 7) > + > +/* > + * ADT7X10 masks > + */ > +#define ADT7X10_T13_VALUE_MASK 0xFFF8 > +#define ADT7X10_T_HYST_MASK 0xF > + > +/* straight from the datasheet */ > +#define ADT7X10_TEMP_MIN (-55000) > +#define ADT7X10_TEMP_MAX 150000 > + > +/* Each client has this additional data */ > +struct adt7x10_data { > + const struct adt7x10_ops *ops; > + const char *name; > + struct device *hwmon_dev; > + struct mutex update_lock; > + u8 config; > + u8 oldconfig; > + bool valid; /* true if registers valid */ > + unsigned long last_updated; /* In jiffies */ > + s16 temp[4]; /* Register values, > + 0 = input > + 1 = high > + 2 = low > + 3 = critical */ > + u8 hyst; /* hysteresis offset */ > +}; > + > +static int adt7x10_read_byte(struct device *dev, u8 reg) > +{ > + struct adt7x10_data *d = dev_get_drvdata(dev); > + return d->ops->read_byte(dev, reg); > +} > + > +static int adt7x10_write_byte(struct device *dev, u8 reg, u8 data) > +{ > + struct adt7x10_data *d = dev_get_drvdata(dev); > + return d->ops->write_byte(dev, reg, data); > +} > + > +static int adt7x10_read_word(struct device *dev, u8 reg) > +{ > + struct adt7x10_data *d = dev_get_drvdata(dev); > + return d->ops->read_word(dev, reg); > +} > + > +static int adt7x10_write_word(struct device *dev, u8 reg, u16 data) > +{ > + struct adt7x10_data *d = dev_get_drvdata(dev); > + return d->ops->write_word(dev, reg, data); > +} > + > +static const u8 ADT7X10_REG_TEMP[4] = { > + ADT7X10_TEMPERATURE, /* input */ > + ADT7X10_T_ALARM_HIGH, /* high */ > + ADT7X10_T_ALARM_LOW, /* low */ > + ADT7X10_T_CRIT, /* critical */ > +}; > + > +static int adt7x10_temp_ready(struct device *dev) > +{ > + int i, status; > + > + for (i = 0; i < 6; i++) { > + status = adt7x10_read_byte(dev, ADT7X10_STATUS); > + if (status < 0) > + return status; > + if (!(status & ADT7X10_STAT_NOT_RDY)) > + return 0; > + msleep(60); > + } > + return -ETIMEDOUT; > +} > + > +static int adt7x10_update_temp(struct device *dev) > +{ > + struct adt7x10_data *data = dev_get_drvdata(dev); > + int ret = 0; > + > + mutex_lock(&data->update_lock); > + > + if (time_after(jiffies, data->last_updated + HZ + HZ / 2) > + || !data->valid) { > + int temp; > + > + dev_dbg(dev, "Starting update\n"); > + > + ret = adt7x10_temp_ready(dev); /* check for new value */ > + if (ret) > + goto abort; > + > + temp = adt7x10_read_word(dev, ADT7X10_REG_TEMP[0]); > + if (temp < 0) { > + ret = temp; > + dev_dbg(dev, "Failed to read value: reg %d, error %d\n", > + ADT7X10_REG_TEMP[0], ret); > + goto abort; > + } > + data->temp[0] = temp; > + data->last_updated = jiffies; > + data->valid = true; > + } > + > +abort: > + mutex_unlock(&data->update_lock); > + return ret; > +} > + > +static int adt7x10_fill_cache(struct device *dev) > +{ > + struct adt7x10_data *data = dev_get_drvdata(dev); > + int ret; > + int i; > + > + for (i = 1; i < ARRAY_SIZE(data->temp); i++) { > + ret = adt7x10_read_word(dev, ADT7X10_REG_TEMP[i]); > + if (ret < 0) { > + dev_dbg(dev, "Failed to read value: reg %d, error %d\n", > + ADT7X10_REG_TEMP[i], ret); > + return ret; > + } > + data->temp[i] = ret; > + } > + > + ret = adt7x10_read_byte(dev, ADT7X10_T_HYST); > + if (ret < 0) { > + dev_dbg(dev, "Failed to read value: reg %d, error %d\n", > + ADT7X10_T_HYST, ret); > + return ret; > + } > + data->hyst = ret; > + > + return 0; > +} > + > +static s16 ADT7X10_TEMP_TO_REG(long temp) > +{ > + return DIV_ROUND_CLOSEST(clamp_val(temp, ADT7X10_TEMP_MIN, > + ADT7X10_TEMP_MAX) * 128, 1000); > +} > + > +static int ADT7X10_REG_TO_TEMP(struct adt7x10_data *data, s16 reg) > +{ > + /* in 13 bit mode, bits 0-2 are status flags - mask them out */ > + if (!(data->config & ADT7X10_RESOLUTION)) > + reg &= ADT7X10_T13_VALUE_MASK; > + /* > + * temperature is stored in twos complement format, in steps of > + * 1/128°C > + */ > + return DIV_ROUND_CLOSEST(reg * 1000, 128); > +} > + > +/*-----------------------------------------------------------------------*/ > + > +/* sysfs attributes for hwmon */ > + > +static ssize_t adt7x10_show_temp(struct device *dev, > + struct device_attribute *da, > + char *buf) > +{ > + struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > + struct adt7x10_data *data = dev_get_drvdata(dev); > + > + > + if (attr->index == 0) { > + int ret; > + > + ret = adt7x10_update_temp(dev); > + if (ret) > + return ret; > + } > + > + return sprintf(buf, "%d\n", ADT7X10_REG_TO_TEMP(data, > + data->temp[attr->index])); > +} > + > +static ssize_t adt7x10_set_temp(struct device *dev, > + struct device_attribute *da, > + const char *buf, size_t count) > +{ > + struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > + struct adt7x10_data *data = dev_get_drvdata(dev); > + int nr = attr->index; > + long temp; > + int ret; > + > + ret = kstrtol(buf, 10, &temp); > + if (ret) > + return ret; > + > + mutex_lock(&data->update_lock); > + data->temp[nr] = ADT7X10_TEMP_TO_REG(temp); > + ret = adt7x10_write_word(dev, ADT7X10_REG_TEMP[nr], data->temp[nr]); > + if (ret) > + count = ret; > + mutex_unlock(&data->update_lock); > + return count; > +} > + > +static ssize_t adt7x10_show_t_hyst(struct device *dev, > + struct device_attribute *da, > + char *buf) > +{ > + struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > + struct adt7x10_data *data = dev_get_drvdata(dev); > + int nr = attr->index; > + int hyst; > + > + hyst = (data->hyst & ADT7X10_T_HYST_MASK) * 1000; > + > + /* > + * hysteresis is stored as a 4 bit offset in the device, convert it > + * to an absolute value > + */ > + if (nr == 2) /* min has positive offset, others have negative */ > + hyst = -hyst; > + return sprintf(buf, "%d\n", > + ADT7X10_REG_TO_TEMP(data, data->temp[nr]) - hyst); > +} > + > +static ssize_t adt7x10_set_t_hyst(struct device *dev, > + struct device_attribute *da, > + const char *buf, size_t count) > +{ > + struct adt7x10_data *data = dev_get_drvdata(dev); > + int limit, ret; > + long hyst; > + > + ret = kstrtol(buf, 10, &hyst); > + if (ret) > + return ret; > + /* convert absolute hysteresis value to a 4 bit delta value */ > + limit = ADT7X10_REG_TO_TEMP(data, data->temp[1]); > + hyst = clamp_val(hyst, ADT7X10_TEMP_MIN, ADT7X10_TEMP_MAX); > + data->hyst = clamp_val(DIV_ROUND_CLOSEST(limit - hyst, 1000), > + 0, ADT7X10_T_HYST_MASK); > + ret = adt7x10_write_byte(dev, ADT7X10_T_HYST, data->hyst); > + if (ret) > + return ret; > + > + return count; > +} > + > +static ssize_t adt7x10_show_alarm(struct device *dev, > + struct device_attribute *da, > + char *buf) > +{ > + struct sensor_device_attribute *attr = to_sensor_dev_attr(da); > + int ret; > + > + ret = adt7x10_read_byte(dev, ADT7X10_STATUS); > + if (ret < 0) > + return ret; > + > + return sprintf(buf, "%d\n", !!(ret & attr->index)); > +} > + > +static ssize_t adt7x10_show_name(struct device *dev, > + struct device_attribute *da, > + char *buf) > +{ > + struct adt7x10_data *data = dev_get_drvdata(dev); > + > + return sprintf(buf, "%s\n", data->name); > +} > + > +static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, adt7x10_show_temp, NULL, 0); > +static SENSOR_DEVICE_ATTR(temp1_max, S_IWUSR | S_IRUGO, > + adt7x10_show_temp, adt7x10_set_temp, 1); > +static SENSOR_DEVICE_ATTR(temp1_min, S_IWUSR | S_IRUGO, > + adt7x10_show_temp, adt7x10_set_temp, 2); > +static SENSOR_DEVICE_ATTR(temp1_crit, S_IWUSR | S_IRUGO, > + adt7x10_show_temp, adt7x10_set_temp, 3); > +static SENSOR_DEVICE_ATTR(temp1_max_hyst, S_IWUSR | S_IRUGO, > + adt7x10_show_t_hyst, adt7x10_set_t_hyst, 1); > +static SENSOR_DEVICE_ATTR(temp1_min_hyst, S_IRUGO, > + adt7x10_show_t_hyst, NULL, 2); > +static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, > + adt7x10_show_t_hyst, NULL, 3); > +static SENSOR_DEVICE_ATTR(temp1_min_alarm, S_IRUGO, adt7x10_show_alarm, > + NULL, ADT7X10_STAT_T_LOW); > +static SENSOR_DEVICE_ATTR(temp1_max_alarm, S_IRUGO, adt7x10_show_alarm, > + NULL, ADT7X10_STAT_T_HIGH); > +static SENSOR_DEVICE_ATTR(temp1_crit_alarm, S_IRUGO, adt7x10_show_alarm, > + NULL, ADT7X10_STAT_T_CRIT); > +static DEVICE_ATTR(name, S_IRUGO, adt7x10_show_name, NULL); > + > +static struct attribute *adt7x10_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_temp1_crit.dev_attr.attr, > + &sensor_dev_attr_temp1_max_hyst.dev_attr.attr, > + &sensor_dev_attr_temp1_min_hyst.dev_attr.attr, > + &sensor_dev_attr_temp1_crit_hyst.dev_attr.attr, > + &sensor_dev_attr_temp1_min_alarm.dev_attr.attr, > + &sensor_dev_attr_temp1_max_alarm.dev_attr.attr, > + &sensor_dev_attr_temp1_crit_alarm.dev_attr.attr, > + NULL > +}; > + > +static const struct attribute_group adt7x10_group = { > + .attrs = adt7x10_attributes, > +}; > + > +int adt7x10_probe(struct device *dev, const char *name, > + const struct adt7x10_ops *ops) > +{ > + struct adt7x10_data *data; > + int ret; > + > + data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + data->ops = ops; > + data->name = name; > + > + dev_set_drvdata(dev, data); > + mutex_init(&data->update_lock); > + > + /* configure as specified */ > + ret = adt7x10_read_byte(dev, ADT7X10_CONFIG); > + if (ret < 0) { > + dev_dbg(dev, "Can't read config? %d\n", ret); > + return ret; > + } > + data->oldconfig = ret; > + > + /* > + * Set to 16 bit resolution, continous conversion and comparator mode. > + */ > + data->config = data->oldconfig; > + data->config &= ~ADT7X10_MODE_MASK; > + data->config |= ADT7X10_FULL | ADT7X10_RESOLUTION | ADT7X10_EVENT_MODE; > + if (data->config != data->oldconfig) { > + ret = adt7x10_write_byte(dev, ADT7X10_CONFIG, data->config); > + if (ret) > + return ret; > + } > + dev_dbg(dev, "Config %02x\n", data->config); > + > + ret = adt7x10_fill_cache(dev); > + if (ret) > + goto exit_restore; > + > + /* Register sysfs hooks */ > + ret = sysfs_create_group(&dev->kobj, &adt7x10_group); > + if (ret) > + goto exit_restore; > + > + /* > + * The I2C device will already have it's own 'name' attribute, but for > + * the SPI device we need to register it. name will only be non NULL if > + * the device doesn't register the 'name' attribute on its own. > + */ > + if (name) { > + ret = device_create_file(dev, &dev_attr_name); > + if (ret) > + goto exit_remove; > + } > + > + data->hwmon_dev = hwmon_device_register(dev); > + if (IS_ERR(data->hwmon_dev)) { > + ret = PTR_ERR(data->hwmon_dev); > + goto exit_remove_name; > + } > + > + return 0; > + > +exit_remove_name: > + if (name) > + device_remove_file(dev, &dev_attr_name); > +exit_remove: > + sysfs_remove_group(&dev->kobj, &adt7x10_group); > +exit_restore: > + adt7x10_write_byte(dev, ADT7X10_CONFIG, data->oldconfig); > + return ret; > +} > +EXPORT_SYMBOL_GPL(adt7x10_probe); > + > +int adt7x10_remove(struct device *dev) > +{ > + struct adt7x10_data *data = dev_get_drvdata(dev); > + > + hwmon_device_unregister(data->hwmon_dev); > + if (data->name) > + device_remove_file(dev, &dev_attr_name); > + sysfs_remove_group(&dev->kobj, &adt7x10_group); > + if (data->oldconfig != data->config) > + adt7x10_write_byte(dev, ADT7X10_CONFIG, data->oldconfig); > + return 0; > +} > +EXPORT_SYMBOL_GPL(adt7x10_remove); > + > +#ifdef CONFIG_PM_SLEEP > + > +static int adt7x10_suspend(struct device *dev) > +{ > + struct adt7x10_data *data = dev_get_drvdata(dev); > + > + return adt7x10_write_byte(dev, ADT7X10_CONFIG, > + data->config | ADT7X10_PD); > +} > + > +static int adt7x10_resume(struct device *dev) > +{ > + struct adt7x10_data *data = dev_get_drvdata(dev); > + > + return adt7x10_write_byte(dev, ADT7X10_CONFIG, data->config); > +} > + > +SIMPLE_DEV_PM_OPS(adt7x10_dev_pm_ops, adt7x10_suspend, adt7x10_resume); > +EXPORT_SYMBOL_GPL(adt7x10_dev_pm_ops); > + > +#endif /* CONFIG_PM_SLEEP */ > + > +MODULE_AUTHOR("Hartmut Knaack"); > +MODULE_DESCRIPTION("ADT7410/ADT7420, ADT7310/ADT7320 common code"); > +MODULE_LICENSE("GPL"); > diff --git a/drivers/hwmon/adt7x10.h b/drivers/hwmon/adt7x10.h > new file mode 100644 > index 0000000..803d9b9 > --- /dev/null > +++ b/drivers/hwmon/adt7x10.h > @@ -0,0 +1,37 @@ > +#ifndef __HWMON_ADT7X10_H__ > +#define __HWMON_ADT7X10_H__ > + > +#include <linux/types.h> > +#include <linux/pm.h> > + > +/* ADT7410 registers definition */ > +#define ADT7X10_TEMPERATURE 0 > +#define ADT7X10_STATUS 2 > +#define ADT7X10_CONFIG 3 > +#define ADT7X10_T_ALARM_HIGH 4 > +#define ADT7X10_T_ALARM_LOW 6 > +#define ADT7X10_T_CRIT 8 > +#define ADT7X10_T_HYST 0xA > +#define ADT7X10_ID 0xB > + > +struct device; > + > +struct adt7x10_ops { > + int (*read_byte)(struct device *, u8 reg); > + int (*write_byte)(struct device *, u8 reg, u8 data); > + int (*read_word)(struct device *, u8 reg); > + int (*write_word)(struct device *, u8 reg, u16 data); > +}; > + > +int adt7x10_probe(struct device *dev, const char *name, > + const struct adt7x10_ops *ops); > +int adt7x10_remove(struct device *dev); > + > +#ifdef CONFIG_PM_SLEEP > +extern const struct dev_pm_ops adt7x10_dev_pm_ops; > +#define ADT7X10_DEV_PM_OPS (&adt7x10_dev_pm_ops) > +#else > +#define ADT7X10_DEV_PM_OPS NULL > +#endif > + > +#endif _______________________________________________ lm-sensors mailing list lm-sensors@xxxxxxxxxxxxxx http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
