Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f58efa9 authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron
Browse files

staging: iio: tsl2x7x: move integration_time* attributes to IIO_INTENSITY channel 



The integration_time* attributes are currently associated with the
IIO_LIGHT channel but should be associated with the IIO_INTENSITY
channel. Directory listing of the sysfs attributes for a TSL2772
with this patch applied:

dev
events
in_illuminance0_calibrate
in_illuminance0_calibscale_available
in_illuminance0_input
in_illuminance0_lux_table
in_illuminance0_target_input
in_intensity0_calibbias
in_intensity0_calibscale
in_intensity0_integration_time
in_intensity0_integration_time_available
in_intensity0_raw
in_intensity1_raw
in_proximity0_calibrate
in_proximity0_calibscale
in_proximity0_calibscale_available
in_proximity0_raw
name
of_node
power
subsystem
uevent

Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent dae013af

drivers/staging/iio/light/tsl2x7x.c

+10 −10
Original line number Diff line number Diff line
@@ -827,7 +827,7 @@ in_illuminance0_calibscale_available_show(struct device *dev, 


static IIO_CONST_ATTR(in_proximity0_calibscale_available, "1 2 4 8");



static IIO_CONST_ATTR(in_illuminance0_integration_time_available,

static IIO_CONST_ATTR(in_intensity0_integration_time_available,

		".00272 - .696");



static ssize_t in_illuminance0_target_input_show(struct device *dev,
@@ -1358,7 +1358,7 @@ static irqreturn_t tsl2x7x_event_handler(int irq, void *private) 


static struct attribute *tsl2x7x_ALS_device_attrs[] = {

	&dev_attr_in_illuminance0_calibscale_available.attr,

	&iio_const_attr_in_illuminance0_integration_time_available

	&iio_const_attr_in_intensity0_integration_time_available

		.dev_attr.attr,

	&dev_attr_in_illuminance0_target_input.attr,

	&dev_attr_in_illuminance0_calibrate.attr,
@@ -1373,7 +1373,7 @@ static struct attribute *tsl2x7x_PRX_device_attrs[] = { 


static struct attribute *tsl2x7x_ALSPRX_device_attrs[] = {

	&dev_attr_in_illuminance0_calibscale_available.attr,

	&iio_const_attr_in_illuminance0_integration_time_available

	&iio_const_attr_in_intensity0_integration_time_available

		.dev_attr.attr,

	&dev_attr_in_illuminance0_target_input.attr,

	&dev_attr_in_illuminance0_calibrate.attr,
@@ -1389,7 +1389,7 @@ static struct attribute *tsl2x7x_PRX2_device_attrs[] = { 


static struct attribute *tsl2x7x_ALSPRX2_device_attrs[] = {

	&dev_attr_in_illuminance0_calibscale_available.attr,

	&iio_const_attr_in_illuminance0_integration_time_available

	&iio_const_attr_in_intensity0_integration_time_available

		.dev_attr.attr,

	&dev_attr_in_illuminance0_target_input.attr,

	&dev_attr_in_illuminance0_calibrate.attr,
@@ -1489,13 +1489,13 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = { 
			.type = IIO_LIGHT,

			.indexed = 1,

			.channel = 0,

			.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |

					      BIT(IIO_CHAN_INFO_INT_TIME),

			.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),

			}, {

			.type = IIO_INTENSITY,

			.indexed = 1,

			.channel = 0,

			.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |

				BIT(IIO_CHAN_INFO_INT_TIME) |

				BIT(IIO_CHAN_INFO_CALIBSCALE) |

				BIT(IIO_CHAN_INFO_CALIBBIAS),

			.event_spec = tsl2x7x_events,
@@ -1529,13 +1529,13 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = { 
			.type = IIO_LIGHT,

			.indexed = 1,

			.channel = 0,

			.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |

					      BIT(IIO_CHAN_INFO_INT_TIME),

			.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),

			}, {

			.type = IIO_INTENSITY,

			.indexed = 1,

			.channel = 0,

			.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |

				BIT(IIO_CHAN_INFO_INT_TIME) |

				BIT(IIO_CHAN_INFO_CALIBSCALE) |

				BIT(IIO_CHAN_INFO_CALIBBIAS),

			.event_spec = tsl2x7x_events,
@@ -1578,13 +1578,13 @@ static const struct tsl2x7x_chip_info tsl2x7x_chip_info_tbl[] = { 
			.type = IIO_LIGHT,

			.indexed = 1,

			.channel = 0,

			.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |

					      BIT(IIO_CHAN_INFO_INT_TIME),

			.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED),

			}, {

			.type = IIO_INTENSITY,

			.indexed = 1,

			.channel = 0,

			.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |

				BIT(IIO_CHAN_INFO_INT_TIME) |

				BIT(IIO_CHAN_INFO_CALIBSCALE) |

				BIT(IIO_CHAN_INFO_CALIBBIAS),

			.event_spec = tsl2x7x_events,