Merge branch 'master' into csb1725

[mv-sheeva.git] / drivers / staging / iio / light / tsl2563.c

diff --git a/drivers/staging/iio/light/tsl2563.c b/drivers/staging/iio/light/tsl2563.c
index 98f8b78f5d8c1b2288964043849d8e3d007bce3e..dadae7527d5c9472437dd5457c3d51b4d7bc4e5b 100644 (file)
--- a/drivers/staging/iio/light/tsl2563.c
+++ b/drivers/staging/iio/light/tsl2563.c
@@ -584,14 +584,14 @@ static ssize_t tsl2563_calib_store(struct device *dev,
        return len;
 }
 
-static IIO_DEVICE_ATTR(intensity_both_raw, S_IRUGO,
+static IIO_DEVICE_ATTR(intensity0_both_raw, S_IRUGO,
                tsl2563_adc_show, NULL, 0);
-static IIO_DEVICE_ATTR(intensity_ir_raw, S_IRUGO,
+static IIO_DEVICE_ATTR(intensity1_ir_raw, S_IRUGO,
                tsl2563_adc_show, NULL, 1);
 static DEVICE_ATTR(illuminance0_input, S_IRUGO, tsl2563_lux_show, NULL);
-static IIO_DEVICE_ATTR(intensity_both_calibgain, S_IRUGO | S_IWUSR,
+static IIO_DEVICE_ATTR(intensity0_both_calibgain, S_IRUGO | S_IWUSR,
                tsl2563_calib_show, tsl2563_calib_store, 0);
-static IIO_DEVICE_ATTR(intensity_ir_calibgain, S_IRUGO | S_IWUSR,
+static IIO_DEVICE_ATTR(intensity1_ir_calibgain, S_IRUGO | S_IWUSR,
                tsl2563_calib_show, tsl2563_calib_store, 1);
 
 static ssize_t tsl2563_show_name(struct device *dev,
@@ -606,11 +606,11 @@ static ssize_t tsl2563_show_name(struct device *dev,
 static DEVICE_ATTR(name, S_IRUGO, tsl2563_show_name, NULL);
 
 static struct attribute *tsl2563_attributes[] = {
-       &iio_dev_attr_intensity_both_raw.dev_attr.attr,
-       &iio_dev_attr_intensity_ir_raw.dev_attr.attr,
+       &iio_dev_attr_intensity0_both_raw.dev_attr.attr,
+       &iio_dev_attr_intensity1_ir_raw.dev_attr.attr,
        &dev_attr_illuminance0_input.attr,
-       &iio_dev_attr_intensity_both_calibgain.dev_attr.attr,
-       &iio_dev_attr_intensity_ir_calibgain.dev_attr.attr,
+       &iio_dev_attr_intensity0_both_calibgain.dev_attr.attr,
+       &iio_dev_attr_intensity1_ir_calibgain.dev_attr.attr,
        &dev_attr_name.attr,
        NULL
 };
@@ -673,13 +673,13 @@ error_ret:
        return ret < 0 ? ret : len;
 }
 
-static IIO_DEVICE_ATTR(intensity_both_thresh_high_value,
+static IIO_DEVICE_ATTR(intensity0_both_raw_thresh_rising_value,
                S_IRUGO | S_IWUSR,
                tsl2563_read_thresh,
                tsl2563_write_thresh,
                TSL2563_REG_HIGHLOW);
 
-static IIO_DEVICE_ATTR(intensity_both_thresh_low_value,
+static IIO_DEVICE_ATTR(intensity0_both_raw_thresh_falling_value,
                S_IRUGO | S_IWUSR,
                tsl2563_read_thresh,
                tsl2563_write_thresh,
@@ -706,8 +706,11 @@ static void tsl2563_int_bh(struct work_struct *work_s)
        u8 cmd = TSL2563_CMD | TSL2563_CLEARINT;
 
        iio_push_event(chip->indio_dev, 0,
-               IIO_EVENT_CODE_LIGHT_BASE,
-               chip->event_timestamp);
+                      IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_LIGHT,
+                                           0,
+                                           IIO_EV_TYPE_THRESH,
+                                           IIO_EV_DIR_EITHER),
+                      chip->event_timestamp);
 
        /* reenable_irq */
        enable_irq(chip->client->irq);
@@ -788,16 +791,16 @@ error_ret:
        return (ret < 0) ? ret : len;
 }
 
-IIO_EVENT_ATTR(intensity_both_thresh_both_en,
+IIO_EVENT_ATTR(intensity0_both_thresh_en,
        tsl2563_read_interrupt_config,
        tsl2563_write_interrupt_config,
        0,
        tsl2563_int_th);
 
 static struct attribute *tsl2563_event_attributes[] = {
-       &iio_event_attr_intensity_both_thresh_both_en.dev_attr.attr,
-       &iio_dev_attr_intensity_both_thresh_high_value.dev_attr.attr,
-       &iio_dev_attr_intensity_both_thresh_low_value.dev_attr.attr,
+       &iio_event_attr_intensity0_both_thresh_en.dev_attr.attr,
+       &iio_dev_attr_intensity0_both_raw_thresh_rising_value.dev_attr.attr,
+       &iio_dev_attr_intensity0_both_raw_thresh_falling_value.dev_attr.attr,
        NULL,
 };