diff options
Diffstat (limited to 'drivers/staging/iio/adc/adt7410.c')
-rw-r--r-- | drivers/staging/iio/adc/adt7410.c | 201 |
1 files changed, 80 insertions, 121 deletions
diff --git a/drivers/staging/iio/adc/adt7410.c b/drivers/staging/iio/adc/adt7410.c index c345f27ec7fc..c40a84f9c2ff 100644 --- a/drivers/staging/iio/adc/adt7410.c +++ b/drivers/staging/iio/adc/adt7410.c @@ -7,15 +7,12 @@ */ #include <linux/interrupt.h> -#include <linux/gpio.h> -#include <linux/workqueue.h> #include <linux/device.h> #include <linux/kernel.h> #include <linux/slab.h> #include <linux/sysfs.h> #include <linux/list.h> #include <linux/i2c.h> -#include <linux/rtc.h> #include "../iio.h" #include "../sysfs.h" @@ -77,11 +74,8 @@ */ struct adt7410_chip_info { - const char *name; struct i2c_client *client; struct iio_dev *indio_dev; - struct work_struct thresh_work; - s64 last_timestamp; u8 config; }; @@ -348,24 +342,12 @@ static ssize_t adt7410_show_value(struct device *dev, static IIO_DEVICE_ATTR(value, S_IRUGO, adt7410_show_value, NULL, 0); -static ssize_t adt7410_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct adt7410_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, adt7410_show_name, NULL, 0); - static struct attribute *adt7410_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, &iio_dev_attr_resolution.dev_attr.attr, &iio_dev_attr_id.dev_attr.attr, &iio_dev_attr_value.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -373,55 +355,38 @@ static const struct attribute_group adt7410_attribute_group = { .attrs = adt7410_attributes, }; -/* - * temperature bound events - */ - -#define IIO_EVENT_CODE_ADT7410_ABOVE_ALARM IIO_BUFFER_EVENT_CODE(0) -#define IIO_EVENT_CODE_ADT7410_BELLOW_ALARM IIO_BUFFER_EVENT_CODE(1) -#define IIO_EVENT_CODE_ADT7410_ABOVE_CRIT IIO_BUFFER_EVENT_CODE(2) - -static void adt7410_interrupt_bh(struct work_struct *work_s) +static irqreturn_t adt7410_event_handler(int irq, void *private) { - struct adt7410_chip_info *chip = - container_of(work_s, struct adt7410_chip_info, thresh_work); + struct iio_dev *indio_dev = private; + struct adt7410_chip_info *chip = iio_dev_get_devdata(indio_dev); + s64 timestamp = iio_get_time_ns(); u8 status; if (adt7410_i2c_read_byte(chip, ADT7410_STATUS, &status)) - return; - - enable_irq(chip->client->irq); + return IRQ_HANDLED; if (status & ADT7410_STAT_T_HIGH) - iio_push_event(chip->indio_dev, 0, - IIO_EVENT_CODE_ADT7410_ABOVE_ALARM, - chip->last_timestamp); + iio_push_event(indio_dev, 0, + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + timestamp); if (status & ADT7410_STAT_T_LOW) - iio_push_event(chip->indio_dev, 0, - IIO_EVENT_CODE_ADT7410_BELLOW_ALARM, - chip->last_timestamp); + iio_push_event(indio_dev, 0, + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_FALLING), + timestamp); if (status & ADT7410_STAT_T_CRIT) - iio_push_event(chip->indio_dev, 0, - IIO_EVENT_CODE_ADT7410_ABOVE_CRIT, - chip->last_timestamp); -} + iio_push_event(indio_dev, 0, + IIO_UNMOD_EVENT_CODE(IIO_TEMP, 0, + IIO_EV_TYPE_THRESH, + IIO_EV_DIR_RISING), + timestamp); -static int adt7410_interrupt(struct iio_dev *dev_info, - int index, - s64 timestamp, - int no_test) -{ - struct adt7410_chip_info *chip = dev_info->dev_data; - - chip->last_timestamp = timestamp; - schedule_work(&chip->thresh_work); - - return 0; + return IRQ_HANDLED; } -IIO_EVENT_SH(adt7410, &adt7410_interrupt); -IIO_EVENT_SH(adt7410_ct, &adt7410_interrupt); - static ssize_t adt7410_show_event_mode(struct device *dev, struct device_attribute *attr, char *buf) @@ -699,49 +664,62 @@ static inline ssize_t adt7410_set_t_hyst(struct device *dev, return ret; } -IIO_EVENT_ATTR_SH(event_mode, iio_event_adt7410, - adt7410_show_event_mode, adt7410_set_event_mode, 0); -IIO_EVENT_ATTR_SH(available_event_modes, iio_event_adt7410, - adt7410_show_available_event_modes, NULL, 0); -IIO_EVENT_ATTR_SH(fault_queue, iio_event_adt7410, - adt7410_show_fault_queue, adt7410_set_fault_queue, 0); -IIO_EVENT_ATTR_SH(t_alarm_high, iio_event_adt7410, - adt7410_show_t_alarm_high, adt7410_set_t_alarm_high, 0); -IIO_EVENT_ATTR_SH(t_alarm_low, iio_event_adt7410, - adt7410_show_t_alarm_low, adt7410_set_t_alarm_low, 0); -IIO_EVENT_ATTR_SH(t_crit, iio_event_adt7410_ct, - adt7410_show_t_crit, adt7410_set_t_crit, 0); -IIO_EVENT_ATTR_SH(t_hyst, iio_event_adt7410, - adt7410_show_t_hyst, adt7410_set_t_hyst, 0); +static IIO_DEVICE_ATTR(event_mode, + S_IRUGO | S_IWUSR, + adt7410_show_event_mode, adt7410_set_event_mode, 0); +static IIO_DEVICE_ATTR(available_event_modes, + S_IRUGO, + adt7410_show_available_event_modes, NULL, 0); +static IIO_DEVICE_ATTR(fault_queue, + S_IRUGO | S_IWUSR, + adt7410_show_fault_queue, adt7410_set_fault_queue, 0); +static IIO_DEVICE_ATTR(t_alarm_high, + S_IRUGO | S_IWUSR, + adt7410_show_t_alarm_high, adt7410_set_t_alarm_high, 0); +static IIO_DEVICE_ATTR(t_alarm_low, + S_IRUGO | S_IWUSR, + adt7410_show_t_alarm_low, adt7410_set_t_alarm_low, 0); +static IIO_DEVICE_ATTR(t_crit, + S_IRUGO | S_IWUSR, + adt7410_show_t_crit, adt7410_set_t_crit, 0); +static IIO_DEVICE_ATTR(t_hyst, + S_IRUGO | S_IWUSR, + adt7410_show_t_hyst, adt7410_set_t_hyst, 0); static struct attribute *adt7410_event_int_attributes[] = { - &iio_event_attr_event_mode.dev_attr.attr, - &iio_event_attr_available_event_modes.dev_attr.attr, - &iio_event_attr_fault_queue.dev_attr.attr, - &iio_event_attr_t_alarm_high.dev_attr.attr, - &iio_event_attr_t_alarm_low.dev_attr.attr, - &iio_event_attr_t_hyst.dev_attr.attr, + &iio_dev_attr_event_mode.dev_attr.attr, + &iio_dev_attr_available_event_modes.dev_attr.attr, + &iio_dev_attr_fault_queue.dev_attr.attr, + &iio_dev_attr_t_alarm_high.dev_attr.attr, + &iio_dev_attr_t_alarm_low.dev_attr.attr, + &iio_dev_attr_t_hyst.dev_attr.attr, NULL, }; static struct attribute *adt7410_event_ct_attributes[] = { - &iio_event_attr_event_mode.dev_attr.attr, - &iio_event_attr_available_event_modes.dev_attr.attr, - &iio_event_attr_fault_queue.dev_attr.attr, - &iio_event_attr_t_crit.dev_attr.attr, - &iio_event_attr_t_hyst.dev_attr.attr, + &iio_dev_attr_event_mode.dev_attr.attr, + &iio_dev_attr_available_event_modes.dev_attr.attr, + &iio_dev_attr_fault_queue.dev_attr.attr, + &iio_dev_attr_t_crit.dev_attr.attr, + &iio_dev_attr_t_hyst.dev_attr.attr, NULL, }; static struct attribute_group adt7410_event_attribute_group[ADT7410_IRQS] = { { .attrs = adt7410_event_int_attributes, - }, - { + }, { .attrs = adt7410_event_ct_attributes, } }; +static const struct iio_info adt7410_info = { + .attrs = &adt7410_attribute_group, + .num_interrupt_lines = ADT7410_IRQS, + .event_attrs = adt7410_event_attribute_group, + .driver_module = THIS_MODULE, +}; + /* * device probe and remove */ @@ -762,20 +740,16 @@ static int __devinit adt7410_probe(struct i2c_client *client, i2c_set_clientdata(client, chip); chip->client = client; - chip->name = id->name; - chip->indio_dev = iio_allocate_device(); + chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { ret = -ENOMEM; goto error_free_chip; } - + chip->indio_dev->name = id->name; chip->indio_dev->dev.parent = &client->dev; - chip->indio_dev->attrs = &adt7410_attribute_group; - chip->indio_dev->event_attrs = adt7410_event_attribute_group; + chip->indio_dev->info = &adt7410_info; chip->indio_dev->dev_data = (void *)chip; - chip->indio_dev->driver_module = THIS_MODULE; - chip->indio_dev->num_interrupt_lines = ADT7410_IRQS; chip->indio_dev->modes = INDIO_DIRECT_MODE; ret = iio_device_register(chip->indio_dev); @@ -784,44 +758,29 @@ static int __devinit adt7410_probe(struct i2c_client *client, /* CT critcal temperature event. line 0 */ if (client->irq) { - ret = iio_register_interrupt_line(client->irq, - chip->indio_dev, - 0, - IRQF_TRIGGER_LOW, - chip->name); + ret = request_threaded_irq(client->irq, + NULL, + &adt7410_event_handler, + IRQF_TRIGGER_LOW, + id->name, + chip->indio_dev); if (ret) goto error_unreg_dev; - - /* - * The event handler list element refer to iio_event_adt7410. - * All event attributes bind to the same event handler. - * One event handler can only be added to one event list. - */ - iio_add_event_to_list(&iio_event_adt7410, - &chip->indio_dev->interrupts[0]->ev_list); } /* INT bound temperature alarm event. line 1 */ if (adt7410_platform_data[0]) { - ret = iio_register_interrupt_line(adt7410_platform_data[0], - chip->indio_dev, - 1, - adt7410_platform_data[1], - chip->name); + ret = request_threaded_irq(adt7410_platform_data[0], + NULL, + &adt7410_event_handler, + adt7410_platform_data[1], + id->name, + chip->indio_dev); if (ret) goto error_unreg_ct_irq; - - /* - * The event handler list element refer to iio_event_adt7410. - * All event attributes bind to the same event handler. - * One event handler can only be added to one event list. - */ - iio_add_event_to_list(&iio_event_adt7410_ct, - &chip->indio_dev->interrupts[1]->ev_list); } if (client->irq && adt7410_platform_data[0]) { - INIT_WORK(&chip->thresh_work, adt7410_interrupt_bh); ret = adt7410_i2c_read_byte(chip, ADT7410_CONFIG, &chip->config); if (ret) { @@ -850,9 +809,9 @@ static int __devinit adt7410_probe(struct i2c_client *client, return 0; error_unreg_int_irq: - iio_unregister_interrupt_line(chip->indio_dev, 1); + free_irq(adt7410_platform_data[0], chip->indio_dev); error_unreg_ct_irq: - iio_unregister_interrupt_line(chip->indio_dev, 0); + free_irq(client->irq, chip->indio_dev); error_unreg_dev: iio_device_unregister(chip->indio_dev); error_free_dev: @@ -870,9 +829,9 @@ static int __devexit adt7410_remove(struct i2c_client *client) unsigned long *adt7410_platform_data = client->dev.platform_data; if (adt7410_platform_data[0]) - iio_unregister_interrupt_line(indio_dev, 1); + free_irq(adt7410_platform_data[0], chip->indio_dev); if (client->irq) - iio_unregister_interrupt_line(indio_dev, 0); + free_irq(client->irq, chip->indio_dev); iio_device_unregister(indio_dev); iio_free_device(chip->indio_dev); kfree(chip); |