patch "iio: proximity: as3935: correct IIO_CHAN_INFO_RAW output" added to staging-linus

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 my staging git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
in the staging-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

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

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(-)

index 6708c5e264aa..33e96f740639 100644
@@ -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]>

index f4d29d5dbd5f..f0a0defb68a4 100644
@@ -72,7 +72,8 @@ static const struct iio_chan_spec as3935_channels[] = {
 		.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_dev *indio_dev,
 		/* 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;

2.8.3