diff options
Diffstat (limited to 'drivers/staging/iio/adc/ad7816.c')
-rw-r--r-- | drivers/staging/iio/adc/ad7816.c | 111 |
1 files changed, 36 insertions, 75 deletions
diff --git a/drivers/staging/iio/adc/ad7816.c b/drivers/staging/iio/adc/ad7816.c index ad7415a..11379e4 100644 --- a/drivers/staging/iio/adc/ad7816.c +++ b/drivers/staging/iio/adc/ad7816.c @@ -8,14 +8,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/spi/spi.h> -#include <linux/rtc.h> #include "../iio.h" #include "../sysfs.h" @@ -44,11 +42,8 @@ */ struct ad7816_chip_info { - const char *name; struct spi_device *spi_dev; struct iio_dev *indio_dev; - struct work_struct thresh_work; - s64 last_timestamp; u16 rdwr_pin; u16 convert_pin; u16 busy_pin; @@ -185,13 +180,13 @@ static ssize_t ad7816_store_channel(struct device *dev, if (data > AD7816_CS_MAX && data != AD7816_CS_MASK) { dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for %s.\n", - data, chip->name); + data, dev_info->name); return -EINVAL; - } else if (strcmp(chip->name, "ad7818") == 0 && data > 1) { + } else if (strcmp(dev_info->name, "ad7818") == 0 && data > 1) { dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for ad7818.\n", data); return -EINVAL; - } else if (strcmp(chip->name, "ad7816") == 0 && data > 0) { + } else if (strcmp(dev_info->name, "ad7816") == 0 && data > 0) { dev_err(&chip->spi_dev->dev, "Invalid channel id %lu for ad7816.\n", data); return -EINVAL; @@ -236,23 +231,11 @@ static ssize_t ad7816_show_value(struct device *dev, static IIO_DEVICE_ATTR(value, S_IRUGO, ad7816_show_value, NULL, 0); -static ssize_t ad7816_show_name(struct device *dev, - struct device_attribute *attr, - char *buf) -{ - struct iio_dev *dev_info = dev_get_drvdata(dev); - struct ad7816_chip_info *chip = dev_info->dev_data; - return sprintf(buf, "%s\n", chip->name); -} - -static IIO_DEVICE_ATTR(name, S_IRUGO, ad7816_show_name, NULL, 0); - static struct attribute *ad7816_attributes[] = { &iio_dev_attr_available_modes.dev_attr.attr, &iio_dev_attr_mode.dev_attr.attr, &iio_dev_attr_channel.dev_attr.attr, &iio_dev_attr_value.dev_attr.attr, - &iio_dev_attr_name.dev_attr.attr, NULL, }; @@ -264,35 +247,19 @@ static const struct attribute_group ad7816_attribute_group = { * temperature bound events */ -#define IIO_EVENT_CODE_AD7816_OTI IIO_BUFFER_EVENT_CODE(0) +#define IIO_EVENT_CODE_AD7816_OTI IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_TEMP, \ + 0, \ + IIO_EV_TYPE_THRESH, \ + IIO_EV_DIR_FALLING) -static void ad7816_interrupt_bh(struct work_struct *work_s) +static irqreturn_t ad7816_event_handler(int irq, void *private) { - struct ad7816_chip_info *chip = - container_of(work_s, struct ad7816_chip_info, thresh_work); - - enable_irq(chip->spi_dev->irq); - - iio_push_event(chip->indio_dev, 0, - IIO_EVENT_CODE_AD7816_OTI, - chip->last_timestamp); + iio_push_event(private, 0, + IIO_EVENT_CODE_AD7816_OTI, + iio_get_time_ns()); + return IRQ_HANDLED; } -static int ad7816_interrupt(struct iio_dev *dev_info, - int index, - s64 timestamp, - int no_test) -{ - struct ad7816_chip_info *chip = dev_info->dev_data; - - chip->last_timestamp = timestamp; - schedule_work(&chip->thresh_work); - - return 0; -} - -IIO_EVENT_SH(ad7816, &ad7816_interrupt); - static ssize_t ad7816_show_oti(struct device *dev, struct device_attribute *attr, char *buf) @@ -352,11 +319,11 @@ static inline ssize_t ad7816_set_oti(struct device *dev, return len; } -IIO_EVENT_ATTR_SH(oti, iio_event_ad7816, - ad7816_show_oti, ad7816_set_oti, 0); +static IIO_DEVICE_ATTR(oti, S_IRUGO | S_IWUSR, + ad7816_show_oti, ad7816_set_oti, 0); static struct attribute *ad7816_event_attributes[] = { - &iio_event_attr_oti.dev_attr.attr, + &iio_dev_attr_oti.dev_attr.attr, NULL, }; @@ -364,6 +331,13 @@ static struct attribute_group ad7816_event_attribute_group = { .attrs = ad7816_event_attributes, }; +static const struct iio_info ad7816_info = { + .attrs = &ad7816_attribute_group, + .num_interrupt_lines = 1, + .event_attrs = &ad7816_event_attribute_group, + .driver_module = THIS_MODULE, +}; + /* * device probe and remove */ @@ -389,28 +363,27 @@ static int __devinit ad7816_probe(struct spi_device *spi_dev) dev_set_drvdata(&spi_dev->dev, chip); chip->spi_dev = spi_dev; - chip->name = spi_dev->modalias; for (i = 0; i <= AD7816_CS_MAX; i++) chip->oti_data[i] = 203; chip->rdwr_pin = pins[0]; chip->convert_pin = pins[1]; chip->busy_pin = pins[2]; - ret = gpio_request(chip->rdwr_pin, chip->name); + ret = gpio_request(chip->rdwr_pin, spi_get_device_id(spi_dev)->name); if (ret) { dev_err(&spi_dev->dev, "Fail to request rdwr gpio PIN %d.\n", chip->rdwr_pin); goto error_free_chip; } gpio_direction_input(chip->rdwr_pin); - ret = gpio_request(chip->convert_pin, chip->name); + ret = gpio_request(chip->convert_pin, spi_get_device_id(spi_dev)->name); if (ret) { dev_err(&spi_dev->dev, "Fail to request convert gpio PIN %d.\n", chip->convert_pin); goto error_free_gpio_rdwr; } gpio_direction_input(chip->convert_pin); - ret = gpio_request(chip->busy_pin, chip->name); + ret = gpio_request(chip->busy_pin, spi_get_device_id(spi_dev)->name); if (ret) { dev_err(&spi_dev->dev, "Fail to request busy gpio PIN %d.\n", chip->busy_pin); @@ -418,18 +391,15 @@ static int __devinit ad7816_probe(struct spi_device *spi_dev) } gpio_direction_input(chip->busy_pin); - chip->indio_dev = iio_allocate_device(); + chip->indio_dev = iio_allocate_device(0); if (chip->indio_dev == NULL) { ret = -ENOMEM; goto error_free_gpio; } - + chip->indio_dev->name = spi_get_device_id(spi_dev)->name; chip->indio_dev->dev.parent = &spi_dev->dev; - chip->indio_dev->attrs = &ad7816_attribute_group; - chip->indio_dev->event_attrs = &ad7816_event_attribute_group; + chip->indio_dev->info = &ad7816_info; chip->indio_dev->dev_data = (void *)chip; - chip->indio_dev->driver_module = THIS_MODULE; - chip->indio_dev->num_interrupt_lines = 1; chip->indio_dev->modes = INDIO_DIRECT_MODE; ret = iio_device_register(chip->indio_dev); @@ -438,27 +408,18 @@ static int __devinit ad7816_probe(struct spi_device *spi_dev) if (spi_dev->irq) { /* Only low trigger is supported in ad7816/7/8 */ - ret = iio_register_interrupt_line(spi_dev->irq, - chip->indio_dev, - 0, - IRQF_TRIGGER_LOW, - chip->name); + ret = request_threaded_irq(spi_dev->irq, + NULL, + &ad7816_event_handler, + IRQF_TRIGGER_LOW, + chip->indio_dev->name, + chip->indio_dev); if (ret) goto error_unreg_dev; - - /* - * The event handler list element refer to iio_event_ad7816. - * All event attributes bind to the same event handler. - * So, only register event handler once. - */ - iio_add_event_to_list(&iio_event_ad7816, - &chip->indio_dev->interrupts[0]->ev_list); - - INIT_WORK(&chip->thresh_work, ad7816_interrupt_bh); } dev_info(&spi_dev->dev, "%s temperature sensor and ADC registered.\n", - chip->name); + chip->indio_dev->name); return 0; @@ -485,7 +446,7 @@ static int __devexit ad7816_remove(struct spi_device *spi_dev) dev_set_drvdata(&spi_dev->dev, NULL); if (spi_dev->irq) - iio_unregister_interrupt_line(indio_dev, 0); + free_irq(spi_dev->irq, indio_dev); iio_device_unregister(indio_dev); iio_free_device(chip->indio_dev); gpio_free(chip->busy_pin); |