On 10/12/11 14:36, michael.hennerich@xxxxxxxxxx wrote:
> From: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
>
>
Obviously hold this one up until the supported is queued up
for merge in hwmon.
> Signed-off-by: Michael Hennerich <michael.hennerich@xxxxxxxxxx>
Acked-by: Jonathan Cameron <jic23@xxxxxxxxx>
> ---
> drivers/staging/iio/adc/Kconfig | 7 -
> drivers/staging/iio/adc/Makefile | 1 -
> drivers/staging/iio/adc/adt75.c | 655 --------------------------------------
> 3 files changed, 0 insertions(+), 663 deletions(-)
> delete mode 100644 drivers/staging/iio/adc/adt75.c
>
> diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
> index 2c1b7de..f0b494f 100644
> --- a/drivers/staging/iio/adc/Kconfig
> +++ b/drivers/staging/iio/adc/Kconfig
> @@ -168,13 +168,6 @@ config AD7192
> To compile this driver as a module, choose M here: the
> module will be called ad7192.
>
> -config ADT75
> - tristate "Analog Devices ADT75 temperature sensor driver"
> - depends on I2C
> - help
> - Say yes here to build support for Analog Devices ADT75
> - temperature sensors.
> -
> config ADT7310
> tristate "Analog Devices ADT7310 temperature sensor driver"
> depends on SPI
> diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
> index 93dc84b..be7faaa 100644
> --- a/drivers/staging/iio/adc/Makefile
> +++ b/drivers/staging/iio/adc/Makefile
> @@ -37,7 +37,6 @@ obj-$(CONFIG_AD7780) += ad7780.o
> obj-$(CONFIG_AD7793) += ad7793.o
> obj-$(CONFIG_AD7816) += ad7816.o
> obj-$(CONFIG_AD7192) += ad7192.o
> -obj-$(CONFIG_ADT75) += adt75.o
> obj-$(CONFIG_ADT7310) += adt7310.o
> obj-$(CONFIG_ADT7410) += adt7410.o
> obj-$(CONFIG_AD7280) += ad7280a.o
> diff --git a/drivers/staging/iio/adc/adt75.c b/drivers/staging/iio/adc/adt75.c
> deleted file mode 100644
> index 08215e9..0000000
> --- a/drivers/staging/iio/adc/adt75.c
> +++ /dev/null
> @@ -1,655 +0,0 @@
> -/*
> - * ADT75 digital temperature sensor driver supporting ADT75
> - *
> - * Copyright 2010 Analog Devices Inc.
> - *
> - * Licensed under the GPL-2 or later.
> - */
> -
> -#include <linux/interrupt.h>
> -#include <linux/device.h>
> -#include <linux/kernel.h>
> -#include <linux/slab.h>
> -#include <linux/sysfs.h>
> -#include <linux/i2c.h>
> -#include <linux/module.h>
> -
> -#include "../iio.h"
> -#include "../sysfs.h"
> -
> -/*
> - * ADT75 registers definition
> - */
> -
> -#define ADT75_TEMPERATURE 0
> -#define ADT75_CONFIG 1
> -#define ADT75_T_HYST 2
> -#define ADT75_T_OS 3
> -#define ADT75_ONESHOT 4
> -
> -/*
> - * ADT75 config
> - */
> -#define ADT75_PD 0x1
> -#define ADT75_OS_INT 0x2
> -#define ADT75_OS_POLARITY 0x4
> -#define ADT75_FAULT_QUEUE_MASK 0x18
> -#define ADT75_FAULT_QUEUE_OFFSET 3
> -#define ADT75_SMBUS_ALART 0x8
> -
> -/*
> - * ADT75 masks
> - */
> -#define ADT75_VALUE_SIGN 0x800
> -#define ADT75_VALUE_OFFSET 4
> -#define ADT75_VALUE_FLOAT_OFFSET 4
> -#define ADT75_VALUE_FLOAT_MASK 0xF
> -
> -
> -/*
> - * struct adt75_chip_info - chip specifc information
> - */
> -
> -struct adt75_chip_info {
> - struct i2c_client *client;
> - u8 config;
> -};
> -
> -/*
> - * adt75 register access by I2C
> - */
> -
> -static int adt75_i2c_read(struct iio_dev *dev_info, u8 reg, u8 *data)
> -{
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - struct i2c_client *client = chip->client;
> - int ret = 0, len;
> -
> - ret = i2c_smbus_write_byte(client, reg);
> - if (ret < 0) {
> - dev_err(&client->dev, "I2C read register address error\n");
> - return ret;
> - }
> -
> - if (reg == ADT75_CONFIG || reg == ADT75_ONESHOT)
> - len = 1;
> - else
> - len = 2;
> -
> - ret = i2c_master_recv(client, data, len);
> - if (ret < 0) {
> - dev_err(&client->dev, "I2C read error\n");
> - return ret;
> - }
> -
> - return ret;
> -}
> -
> -static int adt75_i2c_write(struct iio_dev *dev_info, u8 reg, u8 data)
> -{
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - struct i2c_client *client = chip->client;
> - int ret = 0;
> -
> - if (reg == ADT75_CONFIG || reg == ADT75_ONESHOT)
> - ret = i2c_smbus_write_byte_data(client, reg, data);
> - else
> - ret = i2c_smbus_write_word_data(client, reg, data);
> -
> - if (ret < 0)
> - dev_err(&client->dev, "I2C write error\n");
> -
> - return ret;
> -}
> -
> -static ssize_t adt75_show_mode(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct adt75_chip_info *chip = iio_priv(dev_get_drvdata(dev));
> -
> - if (chip->config & ADT75_PD)
> - return sprintf(buf, "power-save\n");
> - else
> - return sprintf(buf, "full\n");
> -}
> -
> -static ssize_t adt75_store_mode(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - int ret;
> - u8 config;
> -
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - config = chip->config & ~ADT75_PD;
> - if (!strcmp(buf, "full"))
> - config |= ADT75_PD;
> -
> - ret = adt75_i2c_write(dev_info, ADT75_CONFIG, config);
> - if (ret)
> - return -EIO;
> -
> - chip->config = config;
> -
> - return ret;
> -}
> -
> -static IIO_DEVICE_ATTR(mode, S_IRUGO | S_IWUSR,
> - adt75_show_mode,
> - adt75_store_mode,
> - 0);
> -
> -static ssize_t adt75_show_available_modes(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - return sprintf(buf, "full\npower-down\n");
> -}
> -
> -static IIO_DEVICE_ATTR(available_modes, S_IRUGO, adt75_show_available_modes, NULL, 0);
> -
> -static ssize_t adt75_show_oneshot(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct adt75_chip_info *chip = iio_priv(dev_get_drvdata(dev));
> -
> - return sprintf(buf, "%d\n", !!(chip->config & ADT75_ONESHOT));
> -}
> -
> -static ssize_t adt75_store_oneshot(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - unsigned long data = 0;
> - int ret;
> - u8 config;
> -
> - ret = strict_strtoul(buf, 10, &data);
> - if (ret)
> - return -EINVAL;
> -
> -
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - config = chip->config & ~ADT75_ONESHOT;
> - if (data)
> - config |= ADT75_ONESHOT;
> -
> - ret = adt75_i2c_write(dev_info, ADT75_CONFIG, config);
> - if (ret)
> - return -EIO;
> -
> - chip->config = config;
> -
> - return ret;
> -}
> -
> -static IIO_DEVICE_ATTR(oneshot, S_IRUGO | S_IWUSR,
> - adt75_show_oneshot,
> - adt75_store_oneshot,
> - 0);
> -
> -static ssize_t adt75_show_value(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - u16 data;
> - char sign = ' ';
> - int ret;
> -
> - if (chip->config & ADT75_PD) {
> - dev_err(dev, "Can't read value in power-down mode.\n");
> - return -EIO;
> - }
> -
> - if (chip->config & ADT75_ONESHOT) {
> - /* write to active converter */
> - ret = i2c_smbus_write_byte(chip->client, ADT75_ONESHOT);
> - if (ret)
> - return -EIO;
> - }
> -
> - ret = adt75_i2c_read(dev_info, ADT75_TEMPERATURE, (u8 *)&data);
> - if (ret)
> - return -EIO;
> -
> - data = swab16(data) >> ADT75_VALUE_OFFSET;
> - if (data & ADT75_VALUE_SIGN) {
> - /* convert supplement to positive value */
> - data = (ADT75_VALUE_SIGN << 1) - data;
> - sign = '-';
> - }
> -
> - return sprintf(buf, "%c%d.%.4d\n", sign,
> - (data >> ADT75_VALUE_FLOAT_OFFSET),
> - (data & ADT75_VALUE_FLOAT_MASK) * 625);
> -}
> -
> -static IIO_DEVICE_ATTR(value, S_IRUGO, adt75_show_value, NULL, 0);
> -
> -static struct attribute *adt75_attributes[] = {
> - &iio_dev_attr_available_modes.dev_attr.attr,
> - &iio_dev_attr_mode.dev_attr.attr,
> - &iio_dev_attr_oneshot.dev_attr.attr,
> - &iio_dev_attr_value.dev_attr.attr,
> - NULL,
> -};
> -
> -static const struct attribute_group adt75_attribute_group = {
> - .attrs = adt75_attributes,
> -};
> -
> -/*
> - * temperature bound events
> - */
> -
> -#define IIO_EVENT_CODE_ADT75_OTI IIO_UNMOD_EVENT_CODE(IIO_TEMP, \
> - 0, \
> - IIO_EV_TYPE_THRESH, \
> - IIO_EV_DIR_FALLING)
> -
> -static irqreturn_t adt75_event_handler(int irq, void *private)
> -{
> - iio_push_event(private,
> - IIO_EVENT_CODE_ADT75_OTI,
> - iio_get_time_ns());
> -
> - return IRQ_HANDLED;
> -}
> -
> -static ssize_t adt75_show_oti_mode(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - int ret;
> -
> - /* retrive ALART status */
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - if (chip->config & ADT75_OS_INT)
> - return sprintf(buf, "interrupt\n");
> - else
> - return sprintf(buf, "comparator\n");
> -}
> -
> -static ssize_t adt75_set_oti_mode(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - int ret;
> - u8 config;
> -
> - /* retrive ALART status */
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - config = chip->config & ~ADT75_OS_INT;
> - if (strcmp(buf, "comparator") != 0)
> - config |= ADT75_OS_INT;
> -
> - ret = adt75_i2c_write(dev_info, ADT75_CONFIG, config);
> - if (ret)
> - return -EIO;
> -
> - chip->config = config;
> -
> - return ret;
> -}
> -
> -static ssize_t adt75_show_available_oti_modes(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - return sprintf(buf, "comparator\ninterrupt\n");
> -}
> -
> -static ssize_t adt75_show_smbus_alart(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - int ret;
> -
> - /* retrive ALART status */
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - return sprintf(buf, "%d\n", !!(chip->config & ADT75_SMBUS_ALART));
> -}
> -
> -static ssize_t adt75_set_smbus_alart(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - unsigned long data = 0;
> - int ret;
> - u8 config;
> -
> - ret = strict_strtoul(buf, 10, &data);
> - if (ret)
> - return -EINVAL;
> -
> - /* retrive ALART status */
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - config = chip->config & ~ADT75_SMBUS_ALART;
> - if (data)
> - config |= ADT75_SMBUS_ALART;
> -
> - ret = adt75_i2c_write(dev_info, ADT75_CONFIG, config);
> - if (ret)
> - return -EIO;
> -
> - chip->config = config;
> -
> - return ret;
> -}
> -
> -static ssize_t adt75_show_fault_queue(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - int ret;
> -
> - /* retrive ALART status */
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - return sprintf(buf, "%d\n", (chip->config & ADT75_FAULT_QUEUE_MASK) >>
> - ADT75_FAULT_QUEUE_OFFSET);
> -}
> -
> -static ssize_t adt75_set_fault_queue(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> -{
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - struct adt75_chip_info *chip = iio_priv(dev_info);
> - unsigned long data;
> - int ret;
> - u8 config;
> -
> - ret = strict_strtoul(buf, 10, &data);
> - if (ret || data > 3)
> - return -EINVAL;
> -
> - /* retrive ALART status */
> - ret = adt75_i2c_read(dev_info, ADT75_CONFIG, &chip->config);
> - if (ret)
> - return -EIO;
> -
> - config = chip->config & ~ADT75_FAULT_QUEUE_MASK;
> - config |= (data << ADT75_FAULT_QUEUE_OFFSET);
> - ret = adt75_i2c_write(dev_info, ADT75_CONFIG, config);
> - if (ret)
> - return -EIO;
> -
> - chip->config = config;
> -
> - return ret;
> -}
> -static inline ssize_t adt75_show_t_bound(struct device *dev,
> - struct device_attribute *attr,
> - char *buf)
> -{
> - struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - u16 data;
> - char sign = ' ';
> - int ret;
> -
> - ret = adt75_i2c_read(dev_info, this_attr->address, (u8 *)&data);
> - if (ret)
> - return -EIO;
> -
> - data = swab16(data) >> ADT75_VALUE_OFFSET;
> - if (data & ADT75_VALUE_SIGN) {
> - /* convert supplement to positive value */
> - data = (ADT75_VALUE_SIGN << 1) - data;
> - sign = '-';
> - }
> -
> - return sprintf(buf, "%c%d.%.4d\n", sign,
> - (data >> ADT75_VALUE_FLOAT_OFFSET),
> - (data & ADT75_VALUE_FLOAT_MASK) * 625);
> -}
> -
> -static inline ssize_t adt75_set_t_bound(struct device *dev,
> - struct device_attribute *attr,
> - const char *buf,
> - size_t len)
> -{
> - struct iio_dev_attr *this_attr = to_iio_dev_attr(attr);
> - struct iio_dev *dev_info = dev_get_drvdata(dev);
> - long tmp1, tmp2;
> - u16 data;
> - char *pos;
> - int ret;
> -
> - pos = strchr(buf, '.');
> -
> - ret = strict_strtol(buf, 10, &tmp1);
> -
> - if (ret || tmp1 > 127 || tmp1 < -128)
> - return -EINVAL;
> -
> - if (pos) {
> - len = strlen(pos);
> - if (len > ADT75_VALUE_FLOAT_OFFSET)
> - len = ADT75_VALUE_FLOAT_OFFSET;
> - pos[len] = 0;
> - ret = strict_strtol(pos, 10, &tmp2);
> -
> - if (!ret)
> - tmp2 = (tmp2 / 625) * 625;
> - }
> -
> - if (tmp1 < 0)
> - data = (u16)(-tmp1);
> - else
> - data = (u16)tmp1;
> - data = (data << ADT75_VALUE_FLOAT_OFFSET) | (tmp2 & ADT75_VALUE_FLOAT_MASK);
> - if (tmp1 < 0)
> - /* convert positive value to supplyment */
> - data = (ADT75_VALUE_SIGN << 1) - data;
> - data <<= ADT75_VALUE_OFFSET;
> - data = swab16(data);
> -
> - ret = adt75_i2c_write(dev_info, this_attr->address, (u8)data);
> - if (ret)
> - return -EIO;
> -
> - return ret;
> -}
> -
> -
> -static IIO_DEVICE_ATTR(oti_mode,
> - S_IRUGO | S_IWUSR,
> - adt75_show_oti_mode, adt75_set_oti_mode, 0);
> -static IIO_DEVICE_ATTR(available_oti_modes,
> - S_IRUGO,
> - adt75_show_available_oti_modes, NULL, 0);
> -static IIO_DEVICE_ATTR(smbus_alart,
> - S_IRUGO | S_IWUSR,
> - adt75_show_smbus_alart, adt75_set_smbus_alart, 0);
> -static IIO_DEVICE_ATTR(fault_queue,
> - S_IRUGO | S_IWUSR,
> - adt75_show_fault_queue, adt75_set_fault_queue, 0);
> -static IIO_DEVICE_ATTR(t_os_value,
> - S_IRUGO | S_IWUSR,
> - adt75_show_t_bound, adt75_set_t_bound,
> - ADT75_T_OS);
> -static IIO_DEVICE_ATTR(t_hyst_value,
> - S_IRUGO | S_IWUSR,
> - adt75_show_t_bound, adt75_set_t_bound,
> - ADT75_T_HYST);
> -
> -static struct attribute *adt75_event_attributes[] = {
> - &iio_dev_attr_oti_mode.dev_attr.attr,
> - &iio_dev_attr_available_oti_modes.dev_attr.attr,
> - &iio_dev_attr_smbus_alart.dev_attr.attr,
> - &iio_dev_attr_fault_queue.dev_attr.attr,
> - &iio_dev_attr_t_os_value.dev_attr.attr,
> - &iio_dev_attr_t_hyst_value.dev_attr.attr,
> - NULL,
> -};
> -
> -static struct attribute_group adt75_event_attribute_group = {
> - .attrs = adt75_event_attributes,
> - .name = "events",
> -};
> -
> -static const struct iio_info adt75_info = {
> - .attrs = &adt75_attribute_group,
> - .event_attrs = &adt75_event_attribute_group,
> - .driver_module = THIS_MODULE,
> -};
> -
> -/*
> - * device probe and remove
> - */
> -
> -static int __devinit adt75_probe(struct i2c_client *client,
> - const struct i2c_device_id *id)
> -{
> - struct adt75_chip_info *chip;
> - struct iio_dev *indio_dev;
> - int ret = 0;
> -
> - indio_dev = iio_allocate_device(sizeof(*chip));
> - if (indio_dev == NULL) {
> - ret = -ENOMEM;
> - goto error_ret;
> - }
> - chip = iio_priv(indio_dev);
> -
> - /* this is only used for device removal purposes */
> - i2c_set_clientdata(client, indio_dev);
> -
> - chip->client = client;
> -
> - indio_dev->name = id->name;
> - indio_dev->dev.parent = &client->dev;
> - indio_dev->info = &adt75_info;
> - indio_dev->modes = INDIO_DIRECT_MODE;
> -
> - if (client->irq > 0) {
> - ret = request_threaded_irq(client->irq,
> - NULL,
> - &adt75_event_handler,
> - IRQF_TRIGGER_LOW,
> - indio_dev->name,
> - indio_dev);
> - if (ret)
> - goto error_free_dev;
> -
> - ret = adt75_i2c_read(indio_dev, ADT75_CONFIG, &chip->config);
> - if (ret) {
> - ret = -EIO;
> - goto error_unreg_irq;
> - }
> -
> - /* set irq polarity low level */
> - chip->config &= ~ADT75_OS_POLARITY;
> -
> - ret = adt75_i2c_write(indio_dev, ADT75_CONFIG, chip->config);
> - if (ret) {
> - ret = -EIO;
> - goto error_unreg_irq;
> - }
> - }
> -
> - ret = iio_device_register(indio_dev);
> - if (ret)
> - goto error_unreg_irq;
> -
> - dev_info(&client->dev, "%s temperature sensor registered.\n",
> - indio_dev->name);
> -
> - return 0;
> -error_unreg_irq:
> - free_irq(client->irq, indio_dev);
> -error_free_dev:
> - iio_free_device(indio_dev);
> -error_ret:
> - return ret;
> -}
> -
> -static int __devexit adt75_remove(struct i2c_client *client)
> -{
> - struct iio_dev *indio_dev = i2c_get_clientdata(client);
> -
> - if (client->irq)
> - free_irq(client->irq, indio_dev);
> - iio_device_unregister(indio_dev);
> -
> - return 0;
> -}
> -
> -static const struct i2c_device_id adt75_id[] = {
> - { "adt75", 0 },
> - {}
> -};
> -
> -MODULE_DEVICE_TABLE(i2c, adt75_id);
> -
> -static struct i2c_driver adt75_driver = {
> - .driver = {
> - .name = "adt75",
> - },
> - .probe = adt75_probe,
> - .remove = __devexit_p(adt75_remove),
> - .id_table = adt75_id,
> -};
> -
> -static __init int adt75_init(void)
> -{
> - return i2c_add_driver(&adt75_driver);
> -}
> -
> -static __exit void adt75_exit(void)
> -{
> - i2c_del_driver(&adt75_driver);
> -}
> -
> -MODULE_AUTHOR("Sonic Zhang <sonic.zhang@xxxxxxxxxx>");
> -MODULE_DESCRIPTION("Analog Devices ADT75 digital"
> - " temperature sensor driver");
> -MODULE_LICENSE("GPL v2");
> -
> -module_init(adt75_init);
> -module_exit(adt75_exit);
--
To unsubscribe from this list: send the line "unsubscribe linux-iio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
