tjh.dev
Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
staging: iio: tsl2563 event attribute name updates
Patch also renames the two raw channels to add numbers
so that we know to which channel the event code applies.
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
authored by
Jonathan Cameron
and committed by
Greg Kroah-Hartman
45dd3b34
d750e375
+14
-14
+14
-14
drivers/staging/iio/light/tsl2563.c
+14
-14
drivers/staging/iio/light/tsl2563.c
···
584
584
return len;
585
585
}
586
586
587
-
static IIO_DEVICE_ATTR(intensity_both_raw, S_IRUGO,
587
+
static IIO_DEVICE_ATTR(intensity0_both_raw, S_IRUGO,
588
588
tsl2563_adc_show, NULL, 0);
589
-
static IIO_DEVICE_ATTR(intensity_ir_raw, S_IRUGO,
589
+
static IIO_DEVICE_ATTR(intensity1_ir_raw, S_IRUGO,
590
590
tsl2563_adc_show, NULL, 1);
591
591
static DEVICE_ATTR(illuminance0_input, S_IRUGO, tsl2563_lux_show, NULL);
592
-
static IIO_DEVICE_ATTR(intensity_both_calibgain, S_IRUGO | S_IWUSR,
592
+
static IIO_DEVICE_ATTR(intensity0_both_calibgain, S_IRUGO | S_IWUSR,
593
593
tsl2563_calib_show, tsl2563_calib_store, 0);
594
-
static IIO_DEVICE_ATTR(intensity_ir_calibgain, S_IRUGO | S_IWUSR,
594
+
static IIO_DEVICE_ATTR(intensity1_ir_calibgain, S_IRUGO | S_IWUSR,
595
595
tsl2563_calib_show, tsl2563_calib_store, 1);
596
596
597
597
static ssize_t tsl2563_show_name(struct device *dev,
···
606
606
static DEVICE_ATTR(name, S_IRUGO, tsl2563_show_name, NULL);
607
607
608
608
static struct attribute *tsl2563_attributes[] = {
609
-
&iio_dev_attr_intensity_both_raw.dev_attr.attr,
610
-
&iio_dev_attr_intensity_ir_raw.dev_attr.attr,
609
+
&iio_dev_attr_intensity0_both_raw.dev_attr.attr,
610
+
&iio_dev_attr_intensity1_ir_raw.dev_attr.attr,
611
611
&dev_attr_illuminance0_input.attr,
612
-
&iio_dev_attr_intensity_both_calibgain.dev_attr.attr,
613
-
&iio_dev_attr_intensity_ir_calibgain.dev_attr.attr,
612
+
&iio_dev_attr_intensity0_both_calibgain.dev_attr.attr,
613
+
&iio_dev_attr_intensity1_ir_calibgain.dev_attr.attr,
614
614
&dev_attr_name.attr,
615
615
NULL
616
616
};
···
673
673
return ret < 0 ? ret : len;
674
674
}
675
675
676
-
static IIO_DEVICE_ATTR(intensity_both_thresh_high_value,
676
+
static IIO_DEVICE_ATTR(intensity0_both_raw_thresh_rising_value,
677
677
S_IRUGO | S_IWUSR,
678
678
tsl2563_read_thresh,
679
679
tsl2563_write_thresh,
680
680
TSL2563_REG_HIGHLOW);
681
681
682
-
static IIO_DEVICE_ATTR(intensity_both_thresh_low_value,
682
+
static IIO_DEVICE_ATTR(intensity0_both_raw_thresh_falling_value,
683
683
S_IRUGO | S_IWUSR,
684
684
tsl2563_read_thresh,
685
685
tsl2563_write_thresh,
···
791
791
return (ret < 0) ? ret : len;
792
792
}
793
793
794
-
IIO_EVENT_ATTR(intensity_both_thresh_both_en,
794
+
IIO_EVENT_ATTR(intensity0_both_thresh_en,
795
795
tsl2563_read_interrupt_config,
796
796
tsl2563_write_interrupt_config,
797
797
0,
798
798
tsl2563_int_th);
799
799
800
800
static struct attribute *tsl2563_event_attributes[] = {
801
-
&iio_event_attr_intensity_both_thresh_both_en.dev_attr.attr,
802
-
&iio_dev_attr_intensity_both_thresh_high_value.dev_attr.attr,
803
-
&iio_dev_attr_intensity_both_thresh_low_value.dev_attr.attr,
801
+
&iio_event_attr_intensity0_both_thresh_en.dev_attr.attr,
802
+
&iio_dev_attr_intensity0_both_raw_thresh_rising_value.dev_attr.attr,
803
+
&iio_dev_attr_intensity0_both_raw_thresh_falling_value.dev_attr.attr,
804
804
NULL,
805
805
};
806
806