Skip to contentSkip to conversation

Patch "iio: proximity: as3935: correct IIO_CHAN_INFO_RAW output" has been added to the 4.6-stable tree

PATCH [email protected] 1 participant 1 message Jul 25, 2016

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

iio: proximity: as3935: correct IIO_CHAN_INFO_RAW output

to the 4.6-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
iio-proximity-as3935-correct-iio_chan_info_raw-output.patch
and it can be found in the queue-4.6 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 5138806f16c74c7cb8ac3e408a859c79eb7c9567 Mon Sep 17 00:00:00 2001

From: Matt Ranostay <[email protected]>
Date: Sat, 21 May 2016 20:01:01 -0700
Subject: iio: proximity: as3935: correct IIO_CHAN_INFO_RAW output

From: Matt Ranostay <[email protected]>

commit 5138806f16c74c7cb8ac3e408a859c79eb7c9567 upstream.

IIO_CHAN_INFO_RAW was returning processed data which was incorrect. This also adds the IIO_CHAN_INFO_SCALE value to convert to a processed value.

---
 Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 |    2 +-
 drivers/iio/proximity/as3935.c                           |   10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)
Documentation/ABI/testing/sysfs-bus-iio-proximity-as3935 +1 -1
@@ -1,4 +1,4 @@
-What		/sys/bus/iio/devices/iio:deviceX/in_proximity_raw
+What		/sys/bus/iio/devices/iio:deviceX/in_proximity_input
 Date:		March 2014
 KernelVersion:	3.15
 Contact:	Matt Ranostay <[email protected]>
drivers/iio/proximity/as3935.c +8 -2
@@ -72,7 +72,8 @@ static const struct iio_chan_spec as3935
 		.type           = IIO_PROXIMITY,
 		.info_mask_separate =
 			BIT(IIO_CHAN_INFO_RAW) |
-			BIT(IIO_CHAN_INFO_PROCESSED),
+			BIT(IIO_CHAN_INFO_PROCESSED) |
+			BIT(IIO_CHAN_INFO_SCALE),
 		.scan_index     = 0,
 		.scan_type = {
 			.sign           = 'u',
@@ -181,7 +182,12 @@ static int as3935_read_raw(struct iio_de
 		/* storm out of range */
 		if (*val == AS3935_DATA_MASK)
 			return -EINVAL;
-		*val *= 1000;
+
+		if (m == IIO_CHAN_INFO_PROCESSED)
+			*val *= 1000;
+		break;
+	case IIO_CHAN_INFO_SCALE:
+		*val = 1000;
 		break;
 	default:
 		return -EINVAL;

Patches currently in stable-queue which might be from [email protected] are

queue-4.6/iio-hudmidity-hdc100x-fix-incorrect-shifting-and-scaling.patch queue-4.6/iio-proximity-as3935-fix-buffer-stack-trashing.patch queue-4.6/iio-light-apds9960-add-the-missing-dev.parent.patch queue-4.6/iio-proximity-as3935-correct-iio_chan_info_raw-output.patch queue-4.6/iio-proximity-as3935-remove-triggered-buffer-processing.patch queue-4.6/iio-humidity-hdc100x-correct-humidity-integration-time-mask.patch queue-4.6/iio-humidity-hdc100x-fix-iio_temp-channel-reporting.patch