[PATCH 1/4] staging: iio: isl29018: add documentation about the infrared suppression

[PATCH 1/4] staging: iio: isl29018: add documentation about the infrared suppression

[Brian Masney]

Add documentation from the ISL29018 Data Sheet (FN6619.4, Oct 8, 2012)
about the infrared suppression that can be controlled
with the proximity_on_chip_ambient_infrared_suppression sysfs attribute.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/isl29018.c | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
index 51226bd..52bfb1cb 100644
--- a/drivers/staging/iio/light/isl29018.c
+++ b/drivers/staging/iio/light/isl29018.c
@@ -307,6 +307,24 @@ static ssize_t in_illuminance_integration_time_available_show
 	return len;
 }
 
+/*
+ * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
+ * infrared suppression:
+ *
+ *   Proximity Sensing Scheme: Bit 7. This bit programs the function
+ * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
+ * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
+ * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
+ * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
+ * proximity_less_ambient detection. The range of Scheme 1
+ * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
+ * for resolutions less than 16. While Scheme 0 has wider dynamic
+ * range, Scheme 1 proximity detection is less affected by the
+ * ambient IR noise variation.
+ *
+ * 0 Sensing IR from LED and ambient
+ * 1 Sensing IR from LED with ambient IR rejection
+ */
 static ssize_t proximity_on_chip_ambient_infrared_suppression_show
 			(struct device *dev, struct device_attribute *attr,
 			 char *buf)
-- 
2.5.5

[PATCH 2/4] staging: iio: isl29018: document device tree bindings

[Brian Masney]

Fix the following warnings from checkpatch:

WARNING: DT compatible string "isil,isl29018" appears un-documented --
check ./Documentation/devicetree/bindings/
WARNING: DT compatible string "isil,isl29023" appears un-documented --
check ./Documentation/devicetree/bindings/
WARNING: DT compatible string "isil,isl29035" appears un-documented --
check ./Documentation/devicetree/bindings/

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 .../devicetree/bindings/iio/light/isl29018.txt     | 28 ++++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.txt

diff --git a/Documentation/devicetree/bindings/iio/light/isl29018.txt b/Documentation/devicetree/bindings/iio/light/isl29018.txt
new file mode 100644
index 0000000..7e53524
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/light/isl29018.txt
@@ -0,0 +1,28 @@
+* ISL 29018/29023/29035 I2C ALS, Proximity, and Infrared sensor
+
+Required properties:
+
+  - compatible: Should be one of
+		"isil,isl29018"
+		"isil,isl29023"
+		"isil,isl29035"
+  - reg: the I2C address of the device
+
+Optional properties:
+
+  - interrupt-parent: should be the phandle for the interrupt controller
+  - interrupts: the sole interrupt generated by the device
+
+  Refer to interrupt-controller/interrupts.txt for generic interrupt client
+  node bindings.
+
+  - vcc-supply: phandle to the regulator that provides power to the sensor.
+
+Example:
+
+isl29018@44 {
+	compatible = "isil,isl29018";
+	reg = <0x44>;
+	interrupt-parent = <&gpio>;
+	interrupts = <TEGRA_GPIO(Z, 2) IRQ_TYPE_LEVEL_HIGH>;
+};
-- 
2.5.5

Re: [PATCH 2/4] staging: iio: isl29018: document device tree bindings

[Jonathan Cameron]

On 07/10/16 01:48, Brian Masney wrote:
> Fix the following warnings from checkpatch:
> 
> WARNING: DT compatible string "isil,isl29018" appears un-documented --
> check ./Documentation/devicetree/bindings/
> WARNING: DT compatible string "isil,isl29023" appears un-documented --
> check ./Documentation/devicetree/bindings/
> WARNING: DT compatible string "isil,isl29035" appears un-documented --
> check ./Documentation/devicetree/bindings/
> 
> Signed-off-by: Brian Masney <masneyb@onstation.org>
Device tree patches should always be cc'd to the device tree list and
maintainers. (done above).

As this is very simple I'm happy to take it without an Ack from
them (though one would always be welcome and can be added for
a week or so as I'm not pushing this out in a non rebasing tree yet).

Applied to the togreg branch of iio.git - pushed out as testing for
the autobuilders to play with it.

Mark and Rob, just noticed we are down to just the two of you.
Good luck guys and hope you find more assistance soon if you
want it.

Thanks,

Jonathan
> ---
>  .../devicetree/bindings/iio/light/isl29018.txt     | 28 ++++++++++++++++++++++
>  1 file changed, 28 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/iio/light/isl29018.txt
> 
> diff --git a/Documentation/devicetree/bindings/iio/light/isl29018.txt b/Documentation/devicetree/bindings/iio/light/isl29018.txt
> new file mode 100644
> index 0000000..7e53524
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/iio/light/isl29018.txt
> @@ -0,0 +1,28 @@
> +* ISL 29018/29023/29035 I2C ALS, Proximity, and Infrared sensor
> +
> +Required properties:
> +
> +  - compatible: Should be one of
> +		"isil,isl29018"
> +		"isil,isl29023"
> +		"isil,isl29035"
> +  - reg: the I2C address of the device
> +
> +Optional properties:
> +
> +  - interrupt-parent: should be the phandle for the interrupt controller
> +  - interrupts: the sole interrupt generated by the device
> +
> +  Refer to interrupt-controller/interrupts.txt for generic interrupt client
> +  node bindings.
> +
> +  - vcc-supply: phandle to the regulator that provides power to the sensor.
> +
> +Example:
> +
> +isl29018@44 {
> +	compatible = "isil,isl29018";
> +	reg = <0x44>;
> +	interrupt-parent = <&gpio>;
> +	interrupts = <TEGRA_GPIO(Z, 2) IRQ_TYPE_LEVEL_HIGH>;
> +};
> 

[PATCH 3/4] staging: iio: isl29018: rename Kconfig variable to match existing light drivers in mainline.

[Brian Masney]

Rename CONFIG_SENSORS_ISL29018 to CONFIG_ISL29018 for consistency with
the other light drivers in mainline.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/staging/iio/light/Kconfig  | 2 +-
 drivers/staging/iio/light/Makefile | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index ca8d6e6..b0e2948 100644
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -3,7 +3,7 @@
 #
 menu "Light sensors"
 
-config SENSORS_ISL29018
+config ISL29018
 	tristate "ISL 29018 light and proximity sensor"
 	depends on I2C
 	select REGMAP_I2C
diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index 9960fdf..89d6b02 100644
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -2,7 +2,7 @@
 # Makefile for industrial I/O Light sensors
 #
 
-obj-$(CONFIG_SENSORS_ISL29018)	+= isl29018.o
+obj-$(CONFIG_ISL29018)	+= isl29018.o
 obj-$(CONFIG_SENSORS_ISL29028)	+= isl29028.o
 obj-$(CONFIG_TSL2583)	+= tsl2583.o
 obj-$(CONFIG_TSL2x7x)	+= tsl2x7x_core.o
-- 
2.5.5

Re: [PATCH 3/4] staging: iio: isl29018: rename Kconfig variable to match existing light drivers in mainline.

[Jonathan Cameron]

On 07/10/16 01:48, Brian Masney wrote:
> Rename CONFIG_SENSORS_ISL29018 to CONFIG_ISL29018 for consistency with
> the other light drivers in mainline.
> 
> Signed-off-by: Brian Masney <masneyb@onstation.org>
I'm always a bit split on these.  It would be lovely to tidy
it up, but it may cause unnecessary breakage to people's
configs for a very minor gain.  Hence I'm not going to apply this.

Jonathan
> ---
>  drivers/staging/iio/light/Kconfig  | 2 +-
>  drivers/staging/iio/light/Makefile | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
> index ca8d6e6..b0e2948 100644
> --- a/drivers/staging/iio/light/Kconfig
> +++ b/drivers/staging/iio/light/Kconfig
> @@ -3,7 +3,7 @@
>  #
>  menu "Light sensors"
>  
> -config SENSORS_ISL29018
> +config ISL29018
>  	tristate "ISL 29018 light and proximity sensor"
>  	depends on I2C
>  	select REGMAP_I2C
> diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
> index 9960fdf..89d6b02 100644
> --- a/drivers/staging/iio/light/Makefile
> +++ b/drivers/staging/iio/light/Makefile
> @@ -2,7 +2,7 @@
>  # Makefile for industrial I/O Light sensors
>  #
>  
> -obj-$(CONFIG_SENSORS_ISL29018)	+= isl29018.o
> +obj-$(CONFIG_ISL29018)	+= isl29018.o
>  obj-$(CONFIG_SENSORS_ISL29028)	+= isl29028.o
>  obj-$(CONFIG_TSL2583)	+= tsl2583.o
>  obj-$(CONFIG_TSL2x7x)	+= tsl2x7x_core.o
> 

[PATCH 4/4] staging: iio: isl29018: move out of staging

[Brian Masney]

Move ISL29018/ISL29023/ISL29035 driver out of staging into mainline.

Signed-off-by: Brian Masney <masneyb@onstation.org>
---
 drivers/iio/light/Kconfig            |  12 +
 drivers/iio/light/Makefile           |   1 +
 drivers/iio/light/isl29018.c         | 847 +++++++++++++++++++++++++++++++++++
 drivers/staging/iio/light/Kconfig    |  12 -
 drivers/staging/iio/light/Makefile   |   1 -
 drivers/staging/iio/light/isl29018.c | 847 -----------------------------------
 6 files changed, 860 insertions(+), 860 deletions(-)
 create mode 100644 drivers/iio/light/isl29018.c
 delete mode 100644 drivers/staging/iio/light/isl29018.c

diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
index ba2e64d..222a5ad 100644
--- a/drivers/iio/light/Kconfig
+++ b/drivers/iio/light/Kconfig
@@ -140,6 +140,18 @@ config GP2AP020A00F
 	  To compile this driver as a module, choose M here: the
 	  module will be called gp2ap020a00f.
 
+config ISL29018
+	tristate "ISL 29018 light and proximity sensor"
+	depends on I2C
+	select REGMAP_I2C
+	default n
+	help
+	 If you say yes here you get support for ambient light sensing and
+	 proximity infrared sensing from Intersil ISL29018.
+	 This driver will provide the measurements of ambient light intensity
+	 in lux, proximity infrared sensing and normal infrared sensing.
+	 Data from sensor is accessible via sysfs.
+
 config ISL29125
 	tristate "Intersil ISL29125 digital color light sensor"
 	depends on I2C
diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
index c5768df..652240b 100644
--- a/drivers/iio/light/Makefile
+++ b/drivers/iio/light/Makefile
@@ -17,6 +17,7 @@ obj-$(CONFIG_CM36651)		+= cm36651.o
 obj-$(CONFIG_GP2AP020A00F)	+= gp2ap020a00f.o
 obj-$(CONFIG_HID_SENSOR_ALS)	+= hid-sensor-als.o
 obj-$(CONFIG_HID_SENSOR_PROX)	+= hid-sensor-prox.o
+obj-$(CONFIG_ISL29018)		+= isl29018.o
 obj-$(CONFIG_ISL29125)		+= isl29125.o
 obj-$(CONFIG_JSA1212)		+= jsa1212.o
 obj-$(CONFIG_SENSORS_LM3533)	+= lm3533-als.o
diff --git a/drivers/iio/light/isl29018.c b/drivers/iio/light/isl29018.c
new file mode 100644
index 0000000..52bfb1cb
--- /dev/null
+++ b/drivers/iio/light/isl29018.c
@@ -0,0 +1,847 @@
+/*
+ * A iio driver for the light sensor ISL 29018/29023/29035.
+ *
+ * IIO driver for monitoring ambient light intensity in luxi, proximity
+ * sensing and infrared sensing.
+ *
+ * Copyright (c) 2010, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ */
+
+#include <linux/module.h>
+#include <linux/i2c.h>
+#include <linux/err.h>
+#include <linux/mutex.h>
+#include <linux/delay.h>
+#include <linux/regmap.h>
+#include <linux/slab.h>
+#include <linux/iio/iio.h>
+#include <linux/iio/sysfs.h>
+#include <linux/acpi.h>
+
+#define ISL29018_CONV_TIME_MS		100
+
+#define ISL29018_REG_ADD_COMMAND1	0x00
+#define ISL29018_CMD1_OPMODE_SHIFT	5
+#define ISL29018_CMD1_OPMODE_MASK	(7 << ISL29018_CMD1_OPMODE_SHIFT)
+#define ISL29018_CMD1_OPMODE_POWER_DOWN	0
+#define ISL29018_CMD1_OPMODE_ALS_ONCE	1
+#define ISL29018_CMD1_OPMODE_IR_ONCE	2
+#define ISL29018_CMD1_OPMODE_PROX_ONCE	3
+
+#define ISL29018_REG_ADD_COMMAND2	0x01
+#define ISL29018_CMD2_RESOLUTION_SHIFT	2
+#define ISL29018_CMD2_RESOLUTION_MASK	(0x3 << ISL29018_CMD2_RESOLUTION_SHIFT)
+
+#define ISL29018_CMD2_RANGE_SHIFT	0
+#define ISL29018_CMD2_RANGE_MASK	(0x3 << ISL29018_CMD2_RANGE_SHIFT)
+
+#define ISL29018_CMD2_SCHEME_SHIFT	7
+#define ISL29018_CMD2_SCHEME_MASK	(0x1 << ISL29018_CMD2_SCHEME_SHIFT)
+
+#define ISL29018_REG_ADD_DATA_LSB	0x02
+#define ISL29018_REG_ADD_DATA_MSB	0x03
+
+#define ISL29018_REG_TEST		0x08
+#define ISL29018_TEST_SHIFT		0
+#define ISL29018_TEST_MASK		(0xFF << ISL29018_TEST_SHIFT)
+
+#define ISL29035_REG_DEVICE_ID		0x0F
+#define ISL29035_DEVICE_ID_SHIFT	0x03
+#define ISL29035_DEVICE_ID_MASK		(0x7 << ISL29035_DEVICE_ID_SHIFT)
+#define ISL29035_DEVICE_ID		0x5
+#define ISL29035_BOUT_SHIFT		0x07
+#define ISL29035_BOUT_MASK		(0x01 << ISL29035_BOUT_SHIFT)
+
+enum isl29018_int_time {
+	ISL29018_INT_TIME_16,
+	ISL29018_INT_TIME_12,
+	ISL29018_INT_TIME_8,
+	ISL29018_INT_TIME_4,
+};
+
+static const unsigned int isl29018_int_utimes[3][4] = {
+	{90000, 5630, 351, 21},
+	{90000, 5600, 352, 22},
+	{105000, 6500, 410, 25},
+};
+
+static const struct isl29018_scale {
+	unsigned int scale;
+	unsigned int uscale;
+} isl29018_scales[4][4] = {
+	{ {0, 15258}, {0, 61035}, {0, 244140}, {0, 976562} },
+	{ {0, 244140}, {0, 976562}, {3, 906250}, {15, 625000} },
+	{ {3, 906250}, {15, 625000}, {62, 500000}, {250, 0} },
+	{ {62, 500000}, {250, 0}, {1000, 0}, {4000, 0} }
+};
+
+struct isl29018_chip {
+	struct regmap		*regmap;
+	struct mutex		lock;
+	int			type;
+	unsigned int		calibscale;
+	unsigned int		ucalibscale;
+	unsigned int		int_time;
+	struct isl29018_scale	scale;
+	int			prox_scheme;
+	bool			suspended;
+};
+
+static int isl29018_set_integration_time(struct isl29018_chip *chip,
+					 unsigned int utime)
+{
+	unsigned int i;
+	int ret;
+	unsigned int int_time, new_int_time;
+
+	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i) {
+		if (utime == isl29018_int_utimes[chip->type][i]) {
+			new_int_time = i;
+			break;
+		}
+	}
+
+	if (i >= ARRAY_SIZE(isl29018_int_utimes[chip->type]))
+		return -EINVAL;
+
+	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
+				 ISL29018_CMD2_RESOLUTION_MASK,
+				 i << ISL29018_CMD2_RESOLUTION_SHIFT);
+	if (ret < 0)
+		return ret;
+
+	/* Keep the same range when integration time changes */
+	int_time = chip->int_time;
+	for (i = 0; i < ARRAY_SIZE(isl29018_scales[int_time]); ++i) {
+		if (chip->scale.scale == isl29018_scales[int_time][i].scale &&
+		    chip->scale.uscale == isl29018_scales[int_time][i].uscale) {
+			chip->scale = isl29018_scales[new_int_time][i];
+			break;
+		}
+	}
+	chip->int_time = new_int_time;
+
+	return 0;
+}
+
+static int isl29018_set_scale(struct isl29018_chip *chip, int scale, int uscale)
+{
+	unsigned int i;
+	int ret;
+	struct isl29018_scale new_scale;
+
+	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i) {
+		if (scale == isl29018_scales[chip->int_time][i].scale &&
+		    uscale == isl29018_scales[chip->int_time][i].uscale) {
+			new_scale = isl29018_scales[chip->int_time][i];
+			break;
+		}
+	}
+
+	if (i >= ARRAY_SIZE(isl29018_scales[chip->int_time]))
+		return -EINVAL;
+
+	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
+				 ISL29018_CMD2_RANGE_MASK,
+				 i << ISL29018_CMD2_RANGE_SHIFT);
+	if (ret < 0)
+		return ret;
+
+	chip->scale = new_scale;
+
+	return 0;
+}
+
+static int isl29018_read_sensor_input(struct isl29018_chip *chip, int mode)
+{
+	int status;
+	unsigned int lsb;
+	unsigned int msb;
+	struct device *dev = regmap_get_device(chip->regmap);
+
+	/* Set mode */
+	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1,
+			      mode << ISL29018_CMD1_OPMODE_SHIFT);
+	if (status) {
+		dev_err(dev,
+			"Error in setting operating mode err %d\n", status);
+		return status;
+	}
+	msleep(ISL29018_CONV_TIME_MS);
+	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_LSB, &lsb);
+	if (status < 0) {
+		dev_err(dev,
+			"Error in reading LSB DATA with err %d\n", status);
+		return status;
+	}
+
+	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_MSB, &msb);
+	if (status < 0) {
+		dev_err(dev,
+			"Error in reading MSB DATA with error %d\n", status);
+		return status;
+	}
+	dev_vdbg(dev, "MSB 0x%x and LSB 0x%x\n", msb, lsb);
+
+	return (msb << 8) | lsb;
+}
+
+static int isl29018_read_lux(struct isl29018_chip *chip, int *lux)
+{
+	int lux_data;
+	unsigned int data_x_range;
+
+	lux_data = isl29018_read_sensor_input(chip,
+					      ISL29018_CMD1_OPMODE_ALS_ONCE);
+	if (lux_data < 0)
+		return lux_data;
+
+	data_x_range = lux_data * chip->scale.scale +
+		       lux_data * chip->scale.uscale / 1000000;
+	*lux = data_x_range * chip->calibscale +
+	       data_x_range * chip->ucalibscale / 1000000;
+
+	return 0;
+}
+
+static int isl29018_read_ir(struct isl29018_chip *chip, int *ir)
+{
+	int ir_data;
+
+	ir_data = isl29018_read_sensor_input(chip,
+					     ISL29018_CMD1_OPMODE_IR_ONCE);
+	if (ir_data < 0)
+		return ir_data;
+
+	*ir = ir_data;
+
+	return 0;
+}
+
+static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
+				      int *near_ir)
+{
+	int status;
+	int prox_data = -1;
+	int ir_data = -1;
+	struct device *dev = regmap_get_device(chip->regmap);
+
+	/* Do proximity sensing with required scheme */
+	status = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
+				    ISL29018_CMD2_SCHEME_MASK,
+				    scheme << ISL29018_CMD2_SCHEME_SHIFT);
+	if (status) {
+		dev_err(dev, "Error in setting operating mode\n");
+		return status;
+	}
+
+	prox_data = isl29018_read_sensor_input(chip,
+					       ISL29018_CMD1_OPMODE_PROX_ONCE);
+	if (prox_data < 0)
+		return prox_data;
+
+	if (scheme == 1) {
+		*near_ir = prox_data;
+		return 0;
+	}
+
+	ir_data = isl29018_read_sensor_input(chip,
+					     ISL29018_CMD1_OPMODE_IR_ONCE);
+	if (ir_data < 0)
+		return ir_data;
+
+	if (prox_data >= ir_data)
+		*near_ir = prox_data - ir_data;
+	else
+		*near_ir = 0;
+
+	return 0;
+}
+
+static ssize_t in_illuminance_scale_available_show
+			(struct device *dev, struct device_attribute *attr,
+			 char *buf)
+{
+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+	struct isl29018_chip *chip = iio_priv(indio_dev);
+	unsigned int i;
+	int len = 0;
+
+	mutex_lock(&chip->lock);
+	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i)
+		len += sprintf(buf + len, "%d.%06d ",
+			       isl29018_scales[chip->int_time][i].scale,
+			       isl29018_scales[chip->int_time][i].uscale);
+	mutex_unlock(&chip->lock);
+
+	buf[len - 1] = '\n';
+
+	return len;
+}
+
+static ssize_t in_illuminance_integration_time_available_show
+			(struct device *dev, struct device_attribute *attr,
+			 char *buf)
+{
+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+	struct isl29018_chip *chip = iio_priv(indio_dev);
+	unsigned int i;
+	int len = 0;
+
+	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i)
+		len += sprintf(buf + len, "0.%06d ",
+			       isl29018_int_utimes[chip->type][i]);
+
+	buf[len - 1] = '\n';
+
+	return len;
+}
+
+/*
+ * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
+ * infrared suppression:
+ *
+ *   Proximity Sensing Scheme: Bit 7. This bit programs the function
+ * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
+ * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
+ * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
+ * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
+ * proximity_less_ambient detection. The range of Scheme 1
+ * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
+ * for resolutions less than 16. While Scheme 0 has wider dynamic
+ * range, Scheme 1 proximity detection is less affected by the
+ * ambient IR noise variation.
+ *
+ * 0 Sensing IR from LED and ambient
+ * 1 Sensing IR from LED with ambient IR rejection
+ */
+static ssize_t proximity_on_chip_ambient_infrared_suppression_show
+			(struct device *dev, struct device_attribute *attr,
+			 char *buf)
+{
+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+	struct isl29018_chip *chip = iio_priv(indio_dev);
+
+	/*
+	 * Return the "proximity scheme" i.e. if the chip does on chip
+	 * infrared suppression (1 means perform on chip suppression)
+	 */
+	return sprintf(buf, "%d\n", chip->prox_scheme);
+}
+
+static ssize_t proximity_on_chip_ambient_infrared_suppression_store
+			(struct device *dev, struct device_attribute *attr,
+			 const char *buf, size_t count)
+{
+	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
+	struct isl29018_chip *chip = iio_priv(indio_dev);
+	int val;
+
+	if (kstrtoint(buf, 10, &val))
+		return -EINVAL;
+	if (!(val == 0 || val == 1))
+		return -EINVAL;
+
+	/*
+	 * Get the "proximity scheme" i.e. if the chip does on chip
+	 * infrared suppression (1 means perform on chip suppression)
+	 */
+	mutex_lock(&chip->lock);
+	chip->prox_scheme = val;
+	mutex_unlock(&chip->lock);
+
+	return count;
+}
+
+static int isl29018_write_raw(struct iio_dev *indio_dev,
+			      struct iio_chan_spec const *chan,
+			      int val,
+			      int val2,
+			      long mask)
+{
+	struct isl29018_chip *chip = iio_priv(indio_dev);
+	int ret = -EINVAL;
+
+	mutex_lock(&chip->lock);
+	if (chip->suspended) {
+		ret = -EBUSY;
+		goto write_done;
+	}
+	switch (mask) {
+	case IIO_CHAN_INFO_CALIBSCALE:
+		if (chan->type == IIO_LIGHT) {
+			chip->calibscale = val;
+			chip->ucalibscale = val2;
+			ret = 0;
+		}
+		break;
+	case IIO_CHAN_INFO_INT_TIME:
+		if (chan->type == IIO_LIGHT && !val)
+			ret = isl29018_set_integration_time(chip, val2);
+		break;
+	case IIO_CHAN_INFO_SCALE:
+		if (chan->type == IIO_LIGHT)
+			ret = isl29018_set_scale(chip, val, val2);
+		break;
+	default:
+		break;
+	}
+
+write_done:
+	mutex_unlock(&chip->lock);
+	return ret;
+}
+
+static int isl29018_read_raw(struct iio_dev *indio_dev,
+			     struct iio_chan_spec const *chan,
+			     int *val,
+			     int *val2,
+			     long mask)
+{
+	int ret = -EINVAL;
+	struct isl29018_chip *chip = iio_priv(indio_dev);
+
+	mutex_lock(&chip->lock);
+	if (chip->suspended) {
+		ret = -EBUSY;
+		goto read_done;
+	}
+	switch (mask) {
+	case IIO_CHAN_INFO_RAW:
+	case IIO_CHAN_INFO_PROCESSED:
+		switch (chan->type) {
+		case IIO_LIGHT:
+			ret = isl29018_read_lux(chip, val);
+			break;
+		case IIO_INTENSITY:
+			ret = isl29018_read_ir(chip, val);
+			break;
+		case IIO_PROXIMITY:
+			ret = isl29018_read_proximity_ir(chip,
+							 chip->prox_scheme,
+							 val);
+			break;
+		default:
+			break;
+		}
+		if (!ret)
+			ret = IIO_VAL_INT;
+		break;
+	case IIO_CHAN_INFO_INT_TIME:
+		if (chan->type == IIO_LIGHT) {
+			*val = 0;
+			*val2 = isl29018_int_utimes[chip->type][chip->int_time];
+			ret = IIO_VAL_INT_PLUS_MICRO;
+		}
+		break;
+	case IIO_CHAN_INFO_SCALE:
+		if (chan->type == IIO_LIGHT) {
+			*val = chip->scale.scale;
+			*val2 = chip->scale.uscale;
+			ret = IIO_VAL_INT_PLUS_MICRO;
+		}
+		break;
+	case IIO_CHAN_INFO_CALIBSCALE:
+		if (chan->type == IIO_LIGHT) {
+			*val = chip->calibscale;
+			*val2 = chip->ucalibscale;
+			ret = IIO_VAL_INT_PLUS_MICRO;
+		}
+		break;
+	default:
+		break;
+	}
+
+read_done:
+	mutex_unlock(&chip->lock);
+	return ret;
+}
+
+#define ISL29018_LIGHT_CHANNEL {					\
+	.type = IIO_LIGHT,						\
+	.indexed = 1,							\
+	.channel = 0,							\
+	.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |		\
+	BIT(IIO_CHAN_INFO_CALIBSCALE) |					\
+	BIT(IIO_CHAN_INFO_SCALE) |					\
+	BIT(IIO_CHAN_INFO_INT_TIME),					\
+}
+
+#define ISL29018_IR_CHANNEL {						\
+	.type = IIO_INTENSITY,						\
+	.modified = 1,							\
+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
+	.channel2 = IIO_MOD_LIGHT_IR,					\
+}
+
+#define ISL29018_PROXIMITY_CHANNEL {					\
+	.type = IIO_PROXIMITY,						\
+	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
+}
+
+static const struct iio_chan_spec isl29018_channels[] = {
+	ISL29018_LIGHT_CHANNEL,
+	ISL29018_IR_CHANNEL,
+	ISL29018_PROXIMITY_CHANNEL,
+};
+
+static const struct iio_chan_spec isl29023_channels[] = {
+	ISL29018_LIGHT_CHANNEL,
+	ISL29018_IR_CHANNEL,
+};
+
+static IIO_DEVICE_ATTR_RO(in_illuminance_integration_time_available, 0);
+static IIO_DEVICE_ATTR_RO(in_illuminance_scale_available, 0);
+static IIO_DEVICE_ATTR_RW(proximity_on_chip_ambient_infrared_suppression, 0);
+
+#define ISL29018_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
+
+static struct attribute *isl29018_attributes[] = {
+	ISL29018_DEV_ATTR(in_illuminance_scale_available),
+	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
+	ISL29018_DEV_ATTR(proximity_on_chip_ambient_infrared_suppression),
+	NULL
+};
+
+static struct attribute *isl29023_attributes[] = {
+	ISL29018_DEV_ATTR(in_illuminance_scale_available),
+	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
+	NULL
+};
+
+static const struct attribute_group isl29018_group = {
+	.attrs = isl29018_attributes,
+};
+
+static const struct attribute_group isl29023_group = {
+	.attrs = isl29023_attributes,
+};
+
+static int isl29035_detect(struct isl29018_chip *chip)
+{
+	int status;
+	unsigned int id;
+	struct device *dev = regmap_get_device(chip->regmap);
+
+	status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
+	if (status < 0) {
+		dev_err(dev,
+			"Error reading ID register with error %d\n",
+			status);
+		return status;
+	}
+
+	id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
+
+	if (id != ISL29035_DEVICE_ID)
+		return -ENODEV;
+
+	/* Clear brownout bit */
+	return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
+				  ISL29035_BOUT_MASK, 0);
+}
+
+enum {
+	isl29018,
+	isl29023,
+	isl29035,
+};
+
+static int isl29018_chip_init(struct isl29018_chip *chip)
+{
+	int status;
+	struct device *dev = regmap_get_device(chip->regmap);
+
+	if (chip->type == isl29035) {
+		status = isl29035_detect(chip);
+		if (status < 0)
+			return status;
+	}
+
+	/* Code added per Intersil Application Note 1534:
+	 *     When VDD sinks to approximately 1.8V or below, some of
+	 * the part's registers may change their state. When VDD
+	 * recovers to 2.25V (or greater), the part may thus be in an
+	 * unknown mode of operation. The user can return the part to
+	 * a known mode of operation either by (a) setting VDD = 0V for
+	 * 1 second or more and then powering back up with a slew rate
+	 * of 0.5V/ms or greater, or (b) via I2C disable all ALS/PROX
+	 * conversions, clear the test registers, and then rewrite all
+	 * registers to the desired values.
+	 * ...
+	 * For ISL29011, ISL29018, ISL29021, ISL29023
+	 * 1. Write 0x00 to register 0x08 (TEST)
+	 * 2. Write 0x00 to register 0x00 (CMD1)
+	 * 3. Rewrite all registers to the desired values
+	 *
+	 * ISL29018 Data Sheet (FN6619.1, Feb 11, 2010) essentially says
+	 * the same thing EXCEPT the data sheet asks for a 1ms delay after
+	 * writing the CMD1 register.
+	 */
+	status = regmap_write(chip->regmap, ISL29018_REG_TEST, 0x0);
+	if (status < 0) {
+		dev_err(dev, "Failed to clear isl29018 TEST reg.(%d)\n",
+			status);
+		return status;
+	}
+
+	/* See Intersil AN1534 comments above.
+	 * "Operating Mode" (COMMAND1) register is reprogrammed when
+	 * data is read from the device.
+	 */
+	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1, 0);
+	if (status < 0) {
+		dev_err(dev, "Failed to clear isl29018 CMD1 reg.(%d)\n",
+			status);
+		return status;
+	}
+
+	usleep_range(1000, 2000);	/* per data sheet, page 10 */
+
+	/* Set defaults */
+	status = isl29018_set_scale(chip, chip->scale.scale,
+				    chip->scale.uscale);
+	if (status < 0) {
+		dev_err(dev, "Init of isl29018 fails\n");
+		return status;
+	}
+
+	status = isl29018_set_integration_time(chip,
+			isl29018_int_utimes[chip->type][chip->int_time]);
+	if (status < 0) {
+		dev_err(dev, "Init of isl29018 fails\n");
+		return status;
+	}
+
+	return 0;
+}
+
+static const struct iio_info isl29018_info = {
+	.attrs = &isl29018_group,
+	.driver_module = THIS_MODULE,
+	.read_raw = isl29018_read_raw,
+	.write_raw = isl29018_write_raw,
+};
+
+static const struct iio_info isl29023_info = {
+	.attrs = &isl29023_group,
+	.driver_module = THIS_MODULE,
+	.read_raw = isl29018_read_raw,
+	.write_raw = isl29018_write_raw,
+};
+
+static bool isl29018_is_volatile_reg(struct device *dev, unsigned int reg)
+{
+	switch (reg) {
+	case ISL29018_REG_ADD_DATA_LSB:
+	case ISL29018_REG_ADD_DATA_MSB:
+	case ISL29018_REG_ADD_COMMAND1:
+	case ISL29018_REG_TEST:
+	case ISL29035_REG_DEVICE_ID:
+		return true;
+	default:
+		return false;
+	}
+}
+
+static const struct regmap_config isl29018_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.volatile_reg = isl29018_is_volatile_reg,
+	.max_register = ISL29018_REG_TEST,
+	.num_reg_defaults_raw = ISL29018_REG_TEST + 1,
+	.cache_type = REGCACHE_RBTREE,
+};
+
+static const struct regmap_config isl29035_regmap_config = {
+	.reg_bits = 8,
+	.val_bits = 8,
+	.volatile_reg = isl29018_is_volatile_reg,
+	.max_register = ISL29035_REG_DEVICE_ID,
+	.num_reg_defaults_raw = ISL29035_REG_DEVICE_ID + 1,
+	.cache_type = REGCACHE_RBTREE,
+};
+
+struct isl29018_chip_info {
+	const struct iio_chan_spec *channels;
+	int num_channels;
+	const struct iio_info *indio_info;
+	const struct regmap_config *regmap_cfg;
+};
+
+static const struct isl29018_chip_info isl29018_chip_info_tbl[] = {
+	[isl29018] = {
+		.channels = isl29018_channels,
+		.num_channels = ARRAY_SIZE(isl29018_channels),
+		.indio_info = &isl29018_info,
+		.regmap_cfg = &isl29018_regmap_config,
+	},
+	[isl29023] = {
+		.channels = isl29023_channels,
+		.num_channels = ARRAY_SIZE(isl29023_channels),
+		.indio_info = &isl29023_info,
+		.regmap_cfg = &isl29018_regmap_config,
+	},
+	[isl29035] = {
+		.channels = isl29023_channels,
+		.num_channels = ARRAY_SIZE(isl29023_channels),
+		.indio_info = &isl29023_info,
+		.regmap_cfg = &isl29035_regmap_config,
+	},
+};
+
+static const char *isl29018_match_acpi_device(struct device *dev, int *data)
+{
+	const struct acpi_device_id *id;
+
+	id = acpi_match_device(dev->driver->acpi_match_table, dev);
+
+	if (!id)
+		return NULL;
+
+	*data = (int)id->driver_data;
+
+	return dev_name(dev);
+}
+
+static int isl29018_probe(struct i2c_client *client,
+			  const struct i2c_device_id *id)
+{
+	struct isl29018_chip *chip;
+	struct iio_dev *indio_dev;
+	int err;
+	const char *name = NULL;
+	int dev_id = 0;
+
+	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
+	if (!indio_dev)
+		return -ENOMEM;
+	chip = iio_priv(indio_dev);
+
+	i2c_set_clientdata(client, indio_dev);
+
+	if (id) {
+		name = id->name;
+		dev_id = id->driver_data;
+	}
+
+	if (ACPI_HANDLE(&client->dev))
+		name = isl29018_match_acpi_device(&client->dev, &dev_id);
+
+	mutex_init(&chip->lock);
+
+	chip->type = dev_id;
+	chip->calibscale = 1;
+	chip->ucalibscale = 0;
+	chip->int_time = ISL29018_INT_TIME_16;
+	chip->scale = isl29018_scales[chip->int_time][0];
+	chip->suspended = false;
+
+	chip->regmap = devm_regmap_init_i2c(client,
+				isl29018_chip_info_tbl[dev_id].regmap_cfg);
+	if (IS_ERR(chip->regmap)) {
+		err = PTR_ERR(chip->regmap);
+		dev_err(&client->dev, "regmap initialization fails: %d\n", err);
+		return err;
+	}
+
+	err = isl29018_chip_init(chip);
+	if (err)
+		return err;
+
+	indio_dev->info = isl29018_chip_info_tbl[dev_id].indio_info;
+	indio_dev->channels = isl29018_chip_info_tbl[dev_id].channels;
+	indio_dev->num_channels = isl29018_chip_info_tbl[dev_id].num_channels;
+	indio_dev->name = name;
+	indio_dev->dev.parent = &client->dev;
+	indio_dev->modes = INDIO_DIRECT_MODE;
+	return devm_iio_device_register(&client->dev, indio_dev);
+}
+
+#ifdef CONFIG_PM_SLEEP
+static int isl29018_suspend(struct device *dev)
+{
+	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
+
+	mutex_lock(&chip->lock);
+
+	/* Since this driver uses only polling commands, we are by default in
+	 * auto shutdown (ie, power-down) mode.
+	 * So we do not have much to do here.
+	 */
+	chip->suspended = true;
+
+	mutex_unlock(&chip->lock);
+	return 0;
+}
+
+static int isl29018_resume(struct device *dev)
+{
+	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
+	int err;
+
+	mutex_lock(&chip->lock);
+
+	err = isl29018_chip_init(chip);
+	if (!err)
+		chip->suspended = false;
+
+	mutex_unlock(&chip->lock);
+	return err;
+}
+
+static SIMPLE_DEV_PM_OPS(isl29018_pm_ops, isl29018_suspend, isl29018_resume);
+#define ISL29018_PM_OPS (&isl29018_pm_ops)
+#else
+#define ISL29018_PM_OPS NULL
+#endif
+
+static const struct acpi_device_id isl29018_acpi_match[] = {
+	{"ISL29018", isl29018},
+	{"ISL29023", isl29023},
+	{"ISL29035", isl29035},
+	{},
+};
+MODULE_DEVICE_TABLE(acpi, isl29018_acpi_match);
+
+static const struct i2c_device_id isl29018_id[] = {
+	{"isl29018", isl29018},
+	{"isl29023", isl29023},
+	{"isl29035", isl29035},
+	{}
+};
+
+MODULE_DEVICE_TABLE(i2c, isl29018_id);
+
+static const struct of_device_id isl29018_of_match[] = {
+	{ .compatible = "isil,isl29018", },
+	{ .compatible = "isil,isl29023", },
+	{ .compatible = "isil,isl29035", },
+	{ },
+};
+MODULE_DEVICE_TABLE(of, isl29018_of_match);
+
+static struct i2c_driver isl29018_driver = {
+	.driver	 = {
+			.name = "isl29018",
+			.acpi_match_table = ACPI_PTR(isl29018_acpi_match),
+			.pm = ISL29018_PM_OPS,
+			.of_match_table = isl29018_of_match,
+		    },
+	.probe	 = isl29018_probe,
+	.id_table = isl29018_id,
+};
+module_i2c_driver(isl29018_driver);
+
+MODULE_DESCRIPTION("ISL29018 Ambient Light Sensor driver");
+MODULE_LICENSE("GPL");
diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
index b0e2948..dbf22d3 100644
--- a/drivers/staging/iio/light/Kconfig
+++ b/drivers/staging/iio/light/Kconfig
@@ -3,18 +3,6 @@
 #
 menu "Light sensors"
 
-config ISL29018
-	tristate "ISL 29018 light and proximity sensor"
-	depends on I2C
-	select REGMAP_I2C
-	default n
-	help
-	 If you say yes here you get support for ambient light sensing and
-	 proximity infrared sensing from Intersil ISL29018.
-	 This driver will provide the measurements of ambient light intensity
-	 in lux, proximity infrared sensing and normal infrared sensing.
-	 Data from sensor is accessible via sysfs.
-
 config SENSORS_ISL29028
 	tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
 	depends on I2C
diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
index 89d6b02..6480856 100644
--- a/drivers/staging/iio/light/Makefile
+++ b/drivers/staging/iio/light/Makefile
@@ -2,7 +2,6 @@
 # Makefile for industrial I/O Light sensors
 #
 
-obj-$(CONFIG_ISL29018)	+= isl29018.o
 obj-$(CONFIG_SENSORS_ISL29028)	+= isl29028.o
 obj-$(CONFIG_TSL2583)	+= tsl2583.o
 obj-$(CONFIG_TSL2x7x)	+= tsl2x7x_core.o
diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
deleted file mode 100644
index 52bfb1cb..0000000
--- a/drivers/staging/iio/light/isl29018.c
+++ /dev/null
@@ -1,847 +0,0 @@
-/*
- * A iio driver for the light sensor ISL 29018/29023/29035.
- *
- * IIO driver for monitoring ambient light intensity in luxi, proximity
- * sensing and infrared sensing.
- *
- * Copyright (c) 2010, NVIDIA Corporation.
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- */
-
-#include <linux/module.h>
-#include <linux/i2c.h>
-#include <linux/err.h>
-#include <linux/mutex.h>
-#include <linux/delay.h>
-#include <linux/regmap.h>
-#include <linux/slab.h>
-#include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
-#include <linux/acpi.h>
-
-#define ISL29018_CONV_TIME_MS		100
-
-#define ISL29018_REG_ADD_COMMAND1	0x00
-#define ISL29018_CMD1_OPMODE_SHIFT	5
-#define ISL29018_CMD1_OPMODE_MASK	(7 << ISL29018_CMD1_OPMODE_SHIFT)
-#define ISL29018_CMD1_OPMODE_POWER_DOWN	0
-#define ISL29018_CMD1_OPMODE_ALS_ONCE	1
-#define ISL29018_CMD1_OPMODE_IR_ONCE	2
-#define ISL29018_CMD1_OPMODE_PROX_ONCE	3
-
-#define ISL29018_REG_ADD_COMMAND2	0x01
-#define ISL29018_CMD2_RESOLUTION_SHIFT	2
-#define ISL29018_CMD2_RESOLUTION_MASK	(0x3 << ISL29018_CMD2_RESOLUTION_SHIFT)
-
-#define ISL29018_CMD2_RANGE_SHIFT	0
-#define ISL29018_CMD2_RANGE_MASK	(0x3 << ISL29018_CMD2_RANGE_SHIFT)
-
-#define ISL29018_CMD2_SCHEME_SHIFT	7
-#define ISL29018_CMD2_SCHEME_MASK	(0x1 << ISL29018_CMD2_SCHEME_SHIFT)
-
-#define ISL29018_REG_ADD_DATA_LSB	0x02
-#define ISL29018_REG_ADD_DATA_MSB	0x03
-
-#define ISL29018_REG_TEST		0x08
-#define ISL29018_TEST_SHIFT		0
-#define ISL29018_TEST_MASK		(0xFF << ISL29018_TEST_SHIFT)
-
-#define ISL29035_REG_DEVICE_ID		0x0F
-#define ISL29035_DEVICE_ID_SHIFT	0x03
-#define ISL29035_DEVICE_ID_MASK		(0x7 << ISL29035_DEVICE_ID_SHIFT)
-#define ISL29035_DEVICE_ID		0x5
-#define ISL29035_BOUT_SHIFT		0x07
-#define ISL29035_BOUT_MASK		(0x01 << ISL29035_BOUT_SHIFT)
-
-enum isl29018_int_time {
-	ISL29018_INT_TIME_16,
-	ISL29018_INT_TIME_12,
-	ISL29018_INT_TIME_8,
-	ISL29018_INT_TIME_4,
-};
-
-static const unsigned int isl29018_int_utimes[3][4] = {
-	{90000, 5630, 351, 21},
-	{90000, 5600, 352, 22},
-	{105000, 6500, 410, 25},
-};
-
-static const struct isl29018_scale {
-	unsigned int scale;
-	unsigned int uscale;
-} isl29018_scales[4][4] = {
-	{ {0, 15258}, {0, 61035}, {0, 244140}, {0, 976562} },
-	{ {0, 244140}, {0, 976562}, {3, 906250}, {15, 625000} },
-	{ {3, 906250}, {15, 625000}, {62, 500000}, {250, 0} },
-	{ {62, 500000}, {250, 0}, {1000, 0}, {4000, 0} }
-};
-
-struct isl29018_chip {
-	struct regmap		*regmap;
-	struct mutex		lock;
-	int			type;
-	unsigned int		calibscale;
-	unsigned int		ucalibscale;
-	unsigned int		int_time;
-	struct isl29018_scale	scale;
-	int			prox_scheme;
-	bool			suspended;
-};
-
-static int isl29018_set_integration_time(struct isl29018_chip *chip,
-					 unsigned int utime)
-{
-	unsigned int i;
-	int ret;
-	unsigned int int_time, new_int_time;
-
-	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i) {
-		if (utime == isl29018_int_utimes[chip->type][i]) {
-			new_int_time = i;
-			break;
-		}
-	}
-
-	if (i >= ARRAY_SIZE(isl29018_int_utimes[chip->type]))
-		return -EINVAL;
-
-	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
-				 ISL29018_CMD2_RESOLUTION_MASK,
-				 i << ISL29018_CMD2_RESOLUTION_SHIFT);
-	if (ret < 0)
-		return ret;
-
-	/* Keep the same range when integration time changes */
-	int_time = chip->int_time;
-	for (i = 0; i < ARRAY_SIZE(isl29018_scales[int_time]); ++i) {
-		if (chip->scale.scale == isl29018_scales[int_time][i].scale &&
-		    chip->scale.uscale == isl29018_scales[int_time][i].uscale) {
-			chip->scale = isl29018_scales[new_int_time][i];
-			break;
-		}
-	}
-	chip->int_time = new_int_time;
-
-	return 0;
-}
-
-static int isl29018_set_scale(struct isl29018_chip *chip, int scale, int uscale)
-{
-	unsigned int i;
-	int ret;
-	struct isl29018_scale new_scale;
-
-	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i) {
-		if (scale == isl29018_scales[chip->int_time][i].scale &&
-		    uscale == isl29018_scales[chip->int_time][i].uscale) {
-			new_scale = isl29018_scales[chip->int_time][i];
-			break;
-		}
-	}
-
-	if (i >= ARRAY_SIZE(isl29018_scales[chip->int_time]))
-		return -EINVAL;
-
-	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
-				 ISL29018_CMD2_RANGE_MASK,
-				 i << ISL29018_CMD2_RANGE_SHIFT);
-	if (ret < 0)
-		return ret;
-
-	chip->scale = new_scale;
-
-	return 0;
-}
-
-static int isl29018_read_sensor_input(struct isl29018_chip *chip, int mode)
-{
-	int status;
-	unsigned int lsb;
-	unsigned int msb;
-	struct device *dev = regmap_get_device(chip->regmap);
-
-	/* Set mode */
-	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1,
-			      mode << ISL29018_CMD1_OPMODE_SHIFT);
-	if (status) {
-		dev_err(dev,
-			"Error in setting operating mode err %d\n", status);
-		return status;
-	}
-	msleep(ISL29018_CONV_TIME_MS);
-	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_LSB, &lsb);
-	if (status < 0) {
-		dev_err(dev,
-			"Error in reading LSB DATA with err %d\n", status);
-		return status;
-	}
-
-	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_MSB, &msb);
-	if (status < 0) {
-		dev_err(dev,
-			"Error in reading MSB DATA with error %d\n", status);
-		return status;
-	}
-	dev_vdbg(dev, "MSB 0x%x and LSB 0x%x\n", msb, lsb);
-
-	return (msb << 8) | lsb;
-}
-
-static int isl29018_read_lux(struct isl29018_chip *chip, int *lux)
-{
-	int lux_data;
-	unsigned int data_x_range;
-
-	lux_data = isl29018_read_sensor_input(chip,
-					      ISL29018_CMD1_OPMODE_ALS_ONCE);
-	if (lux_data < 0)
-		return lux_data;
-
-	data_x_range = lux_data * chip->scale.scale +
-		       lux_data * chip->scale.uscale / 1000000;
-	*lux = data_x_range * chip->calibscale +
-	       data_x_range * chip->ucalibscale / 1000000;
-
-	return 0;
-}
-
-static int isl29018_read_ir(struct isl29018_chip *chip, int *ir)
-{
-	int ir_data;
-
-	ir_data = isl29018_read_sensor_input(chip,
-					     ISL29018_CMD1_OPMODE_IR_ONCE);
-	if (ir_data < 0)
-		return ir_data;
-
-	*ir = ir_data;
-
-	return 0;
-}
-
-static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
-				      int *near_ir)
-{
-	int status;
-	int prox_data = -1;
-	int ir_data = -1;
-	struct device *dev = regmap_get_device(chip->regmap);
-
-	/* Do proximity sensing with required scheme */
-	status = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
-				    ISL29018_CMD2_SCHEME_MASK,
-				    scheme << ISL29018_CMD2_SCHEME_SHIFT);
-	if (status) {
-		dev_err(dev, "Error in setting operating mode\n");
-		return status;
-	}
-
-	prox_data = isl29018_read_sensor_input(chip,
-					       ISL29018_CMD1_OPMODE_PROX_ONCE);
-	if (prox_data < 0)
-		return prox_data;
-
-	if (scheme == 1) {
-		*near_ir = prox_data;
-		return 0;
-	}
-
-	ir_data = isl29018_read_sensor_input(chip,
-					     ISL29018_CMD1_OPMODE_IR_ONCE);
-	if (ir_data < 0)
-		return ir_data;
-
-	if (prox_data >= ir_data)
-		*near_ir = prox_data - ir_data;
-	else
-		*near_ir = 0;
-
-	return 0;
-}
-
-static ssize_t in_illuminance_scale_available_show
-			(struct device *dev, struct device_attribute *attr,
-			 char *buf)
-{
-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	struct isl29018_chip *chip = iio_priv(indio_dev);
-	unsigned int i;
-	int len = 0;
-
-	mutex_lock(&chip->lock);
-	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i)
-		len += sprintf(buf + len, "%d.%06d ",
-			       isl29018_scales[chip->int_time][i].scale,
-			       isl29018_scales[chip->int_time][i].uscale);
-	mutex_unlock(&chip->lock);
-
-	buf[len - 1] = '\n';
-
-	return len;
-}
-
-static ssize_t in_illuminance_integration_time_available_show
-			(struct device *dev, struct device_attribute *attr,
-			 char *buf)
-{
-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	struct isl29018_chip *chip = iio_priv(indio_dev);
-	unsigned int i;
-	int len = 0;
-
-	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i)
-		len += sprintf(buf + len, "0.%06d ",
-			       isl29018_int_utimes[chip->type][i]);
-
-	buf[len - 1] = '\n';
-
-	return len;
-}
-
-/*
- * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
- * infrared suppression:
- *
- *   Proximity Sensing Scheme: Bit 7. This bit programs the function
- * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
- * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
- * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
- * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
- * proximity_less_ambient detection. The range of Scheme 1
- * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
- * for resolutions less than 16. While Scheme 0 has wider dynamic
- * range, Scheme 1 proximity detection is less affected by the
- * ambient IR noise variation.
- *
- * 0 Sensing IR from LED and ambient
- * 1 Sensing IR from LED with ambient IR rejection
- */
-static ssize_t proximity_on_chip_ambient_infrared_suppression_show
-			(struct device *dev, struct device_attribute *attr,
-			 char *buf)
-{
-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	struct isl29018_chip *chip = iio_priv(indio_dev);
-
-	/*
-	 * Return the "proximity scheme" i.e. if the chip does on chip
-	 * infrared suppression (1 means perform on chip suppression)
-	 */
-	return sprintf(buf, "%d\n", chip->prox_scheme);
-}
-
-static ssize_t proximity_on_chip_ambient_infrared_suppression_store
-			(struct device *dev, struct device_attribute *attr,
-			 const char *buf, size_t count)
-{
-	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
-	struct isl29018_chip *chip = iio_priv(indio_dev);
-	int val;
-
-	if (kstrtoint(buf, 10, &val))
-		return -EINVAL;
-	if (!(val == 0 || val == 1))
-		return -EINVAL;
-
-	/*
-	 * Get the "proximity scheme" i.e. if the chip does on chip
-	 * infrared suppression (1 means perform on chip suppression)
-	 */
-	mutex_lock(&chip->lock);
-	chip->prox_scheme = val;
-	mutex_unlock(&chip->lock);
-
-	return count;
-}
-
-static int isl29018_write_raw(struct iio_dev *indio_dev,
-			      struct iio_chan_spec const *chan,
-			      int val,
-			      int val2,
-			      long mask)
-{
-	struct isl29018_chip *chip = iio_priv(indio_dev);
-	int ret = -EINVAL;
-
-	mutex_lock(&chip->lock);
-	if (chip->suspended) {
-		ret = -EBUSY;
-		goto write_done;
-	}
-	switch (mask) {
-	case IIO_CHAN_INFO_CALIBSCALE:
-		if (chan->type == IIO_LIGHT) {
-			chip->calibscale = val;
-			chip->ucalibscale = val2;
-			ret = 0;
-		}
-		break;
-	case IIO_CHAN_INFO_INT_TIME:
-		if (chan->type == IIO_LIGHT && !val)
-			ret = isl29018_set_integration_time(chip, val2);
-		break;
-	case IIO_CHAN_INFO_SCALE:
-		if (chan->type == IIO_LIGHT)
-			ret = isl29018_set_scale(chip, val, val2);
-		break;
-	default:
-		break;
-	}
-
-write_done:
-	mutex_unlock(&chip->lock);
-	return ret;
-}
-
-static int isl29018_read_raw(struct iio_dev *indio_dev,
-			     struct iio_chan_spec const *chan,
-			     int *val,
-			     int *val2,
-			     long mask)
-{
-	int ret = -EINVAL;
-	struct isl29018_chip *chip = iio_priv(indio_dev);
-
-	mutex_lock(&chip->lock);
-	if (chip->suspended) {
-		ret = -EBUSY;
-		goto read_done;
-	}
-	switch (mask) {
-	case IIO_CHAN_INFO_RAW:
-	case IIO_CHAN_INFO_PROCESSED:
-		switch (chan->type) {
-		case IIO_LIGHT:
-			ret = isl29018_read_lux(chip, val);
-			break;
-		case IIO_INTENSITY:
-			ret = isl29018_read_ir(chip, val);
-			break;
-		case IIO_PROXIMITY:
-			ret = isl29018_read_proximity_ir(chip,
-							 chip->prox_scheme,
-							 val);
-			break;
-		default:
-			break;
-		}
-		if (!ret)
-			ret = IIO_VAL_INT;
-		break;
-	case IIO_CHAN_INFO_INT_TIME:
-		if (chan->type == IIO_LIGHT) {
-			*val = 0;
-			*val2 = isl29018_int_utimes[chip->type][chip->int_time];
-			ret = IIO_VAL_INT_PLUS_MICRO;
-		}
-		break;
-	case IIO_CHAN_INFO_SCALE:
-		if (chan->type == IIO_LIGHT) {
-			*val = chip->scale.scale;
-			*val2 = chip->scale.uscale;
-			ret = IIO_VAL_INT_PLUS_MICRO;
-		}
-		break;
-	case IIO_CHAN_INFO_CALIBSCALE:
-		if (chan->type == IIO_LIGHT) {
-			*val = chip->calibscale;
-			*val2 = chip->ucalibscale;
-			ret = IIO_VAL_INT_PLUS_MICRO;
-		}
-		break;
-	default:
-		break;
-	}
-
-read_done:
-	mutex_unlock(&chip->lock);
-	return ret;
-}
-
-#define ISL29018_LIGHT_CHANNEL {					\
-	.type = IIO_LIGHT,						\
-	.indexed = 1,							\
-	.channel = 0,							\
-	.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |		\
-	BIT(IIO_CHAN_INFO_CALIBSCALE) |					\
-	BIT(IIO_CHAN_INFO_SCALE) |					\
-	BIT(IIO_CHAN_INFO_INT_TIME),					\
-}
-
-#define ISL29018_IR_CHANNEL {						\
-	.type = IIO_INTENSITY,						\
-	.modified = 1,							\
-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
-	.channel2 = IIO_MOD_LIGHT_IR,					\
-}
-
-#define ISL29018_PROXIMITY_CHANNEL {					\
-	.type = IIO_PROXIMITY,						\
-	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
-}
-
-static const struct iio_chan_spec isl29018_channels[] = {
-	ISL29018_LIGHT_CHANNEL,
-	ISL29018_IR_CHANNEL,
-	ISL29018_PROXIMITY_CHANNEL,
-};
-
-static const struct iio_chan_spec isl29023_channels[] = {
-	ISL29018_LIGHT_CHANNEL,
-	ISL29018_IR_CHANNEL,
-};
-
-static IIO_DEVICE_ATTR_RO(in_illuminance_integration_time_available, 0);
-static IIO_DEVICE_ATTR_RO(in_illuminance_scale_available, 0);
-static IIO_DEVICE_ATTR_RW(proximity_on_chip_ambient_infrared_suppression, 0);
-
-#define ISL29018_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
-
-static struct attribute *isl29018_attributes[] = {
-	ISL29018_DEV_ATTR(in_illuminance_scale_available),
-	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
-	ISL29018_DEV_ATTR(proximity_on_chip_ambient_infrared_suppression),
-	NULL
-};
-
-static struct attribute *isl29023_attributes[] = {
-	ISL29018_DEV_ATTR(in_illuminance_scale_available),
-	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
-	NULL
-};
-
-static const struct attribute_group isl29018_group = {
-	.attrs = isl29018_attributes,
-};
-
-static const struct attribute_group isl29023_group = {
-	.attrs = isl29023_attributes,
-};
-
-static int isl29035_detect(struct isl29018_chip *chip)
-{
-	int status;
-	unsigned int id;
-	struct device *dev = regmap_get_device(chip->regmap);
-
-	status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
-	if (status < 0) {
-		dev_err(dev,
-			"Error reading ID register with error %d\n",
-			status);
-		return status;
-	}
-
-	id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
-
-	if (id != ISL29035_DEVICE_ID)
-		return -ENODEV;
-
-	/* Clear brownout bit */
-	return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
-				  ISL29035_BOUT_MASK, 0);
-}
-
-enum {
-	isl29018,
-	isl29023,
-	isl29035,
-};
-
-static int isl29018_chip_init(struct isl29018_chip *chip)
-{
-	int status;
-	struct device *dev = regmap_get_device(chip->regmap);
-
-	if (chip->type == isl29035) {
-		status = isl29035_detect(chip);
-		if (status < 0)
-			return status;
-	}
-
-	/* Code added per Intersil Application Note 1534:
-	 *     When VDD sinks to approximately 1.8V or below, some of
-	 * the part's registers may change their state. When VDD
-	 * recovers to 2.25V (or greater), the part may thus be in an
-	 * unknown mode of operation. The user can return the part to
-	 * a known mode of operation either by (a) setting VDD = 0V for
-	 * 1 second or more and then powering back up with a slew rate
-	 * of 0.5V/ms or greater, or (b) via I2C disable all ALS/PROX
-	 * conversions, clear the test registers, and then rewrite all
-	 * registers to the desired values.
-	 * ...
-	 * For ISL29011, ISL29018, ISL29021, ISL29023
-	 * 1. Write 0x00 to register 0x08 (TEST)
-	 * 2. Write 0x00 to register 0x00 (CMD1)
-	 * 3. Rewrite all registers to the desired values
-	 *
-	 * ISL29018 Data Sheet (FN6619.1, Feb 11, 2010) essentially says
-	 * the same thing EXCEPT the data sheet asks for a 1ms delay after
-	 * writing the CMD1 register.
-	 */
-	status = regmap_write(chip->regmap, ISL29018_REG_TEST, 0x0);
-	if (status < 0) {
-		dev_err(dev, "Failed to clear isl29018 TEST reg.(%d)\n",
-			status);
-		return status;
-	}
-
-	/* See Intersil AN1534 comments above.
-	 * "Operating Mode" (COMMAND1) register is reprogrammed when
-	 * data is read from the device.
-	 */
-	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1, 0);
-	if (status < 0) {
-		dev_err(dev, "Failed to clear isl29018 CMD1 reg.(%d)\n",
-			status);
-		return status;
-	}
-
-	usleep_range(1000, 2000);	/* per data sheet, page 10 */
-
-	/* Set defaults */
-	status = isl29018_set_scale(chip, chip->scale.scale,
-				    chip->scale.uscale);
-	if (status < 0) {
-		dev_err(dev, "Init of isl29018 fails\n");
-		return status;
-	}
-
-	status = isl29018_set_integration_time(chip,
-			isl29018_int_utimes[chip->type][chip->int_time]);
-	if (status < 0) {
-		dev_err(dev, "Init of isl29018 fails\n");
-		return status;
-	}
-
-	return 0;
-}
-
-static const struct iio_info isl29018_info = {
-	.attrs = &isl29018_group,
-	.driver_module = THIS_MODULE,
-	.read_raw = isl29018_read_raw,
-	.write_raw = isl29018_write_raw,
-};
-
-static const struct iio_info isl29023_info = {
-	.attrs = &isl29023_group,
-	.driver_module = THIS_MODULE,
-	.read_raw = isl29018_read_raw,
-	.write_raw = isl29018_write_raw,
-};
-
-static bool isl29018_is_volatile_reg(struct device *dev, unsigned int reg)
-{
-	switch (reg) {
-	case ISL29018_REG_ADD_DATA_LSB:
-	case ISL29018_REG_ADD_DATA_MSB:
-	case ISL29018_REG_ADD_COMMAND1:
-	case ISL29018_REG_TEST:
-	case ISL29035_REG_DEVICE_ID:
-		return true;
-	default:
-		return false;
-	}
-}
-
-static const struct regmap_config isl29018_regmap_config = {
-	.reg_bits = 8,
-	.val_bits = 8,
-	.volatile_reg = isl29018_is_volatile_reg,
-	.max_register = ISL29018_REG_TEST,
-	.num_reg_defaults_raw = ISL29018_REG_TEST + 1,
-	.cache_type = REGCACHE_RBTREE,
-};
-
-static const struct regmap_config isl29035_regmap_config = {
-	.reg_bits = 8,
-	.val_bits = 8,
-	.volatile_reg = isl29018_is_volatile_reg,
-	.max_register = ISL29035_REG_DEVICE_ID,
-	.num_reg_defaults_raw = ISL29035_REG_DEVICE_ID + 1,
-	.cache_type = REGCACHE_RBTREE,
-};
-
-struct isl29018_chip_info {
-	const struct iio_chan_spec *channels;
-	int num_channels;
-	const struct iio_info *indio_info;
-	const struct regmap_config *regmap_cfg;
-};
-
-static const struct isl29018_chip_info isl29018_chip_info_tbl[] = {
-	[isl29018] = {
-		.channels = isl29018_channels,
-		.num_channels = ARRAY_SIZE(isl29018_channels),
-		.indio_info = &isl29018_info,
-		.regmap_cfg = &isl29018_regmap_config,
-	},
-	[isl29023] = {
-		.channels = isl29023_channels,
-		.num_channels = ARRAY_SIZE(isl29023_channels),
-		.indio_info = &isl29023_info,
-		.regmap_cfg = &isl29018_regmap_config,
-	},
-	[isl29035] = {
-		.channels = isl29023_channels,
-		.num_channels = ARRAY_SIZE(isl29023_channels),
-		.indio_info = &isl29023_info,
-		.regmap_cfg = &isl29035_regmap_config,
-	},
-};
-
-static const char *isl29018_match_acpi_device(struct device *dev, int *data)
-{
-	const struct acpi_device_id *id;
-
-	id = acpi_match_device(dev->driver->acpi_match_table, dev);
-
-	if (!id)
-		return NULL;
-
-	*data = (int)id->driver_data;
-
-	return dev_name(dev);
-}
-
-static int isl29018_probe(struct i2c_client *client,
-			  const struct i2c_device_id *id)
-{
-	struct isl29018_chip *chip;
-	struct iio_dev *indio_dev;
-	int err;
-	const char *name = NULL;
-	int dev_id = 0;
-
-	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
-	if (!indio_dev)
-		return -ENOMEM;
-	chip = iio_priv(indio_dev);
-
-	i2c_set_clientdata(client, indio_dev);
-
-	if (id) {
-		name = id->name;
-		dev_id = id->driver_data;
-	}
-
-	if (ACPI_HANDLE(&client->dev))
-		name = isl29018_match_acpi_device(&client->dev, &dev_id);
-
-	mutex_init(&chip->lock);
-
-	chip->type = dev_id;
-	chip->calibscale = 1;
-	chip->ucalibscale = 0;
-	chip->int_time = ISL29018_INT_TIME_16;
-	chip->scale = isl29018_scales[chip->int_time][0];
-	chip->suspended = false;
-
-	chip->regmap = devm_regmap_init_i2c(client,
-				isl29018_chip_info_tbl[dev_id].regmap_cfg);
-	if (IS_ERR(chip->regmap)) {
-		err = PTR_ERR(chip->regmap);
-		dev_err(&client->dev, "regmap initialization fails: %d\n", err);
-		return err;
-	}
-
-	err = isl29018_chip_init(chip);
-	if (err)
-		return err;
-
-	indio_dev->info = isl29018_chip_info_tbl[dev_id].indio_info;
-	indio_dev->channels = isl29018_chip_info_tbl[dev_id].channels;
-	indio_dev->num_channels = isl29018_chip_info_tbl[dev_id].num_channels;
-	indio_dev->name = name;
-	indio_dev->dev.parent = &client->dev;
-	indio_dev->modes = INDIO_DIRECT_MODE;
-	return devm_iio_device_register(&client->dev, indio_dev);
-}
-
-#ifdef CONFIG_PM_SLEEP
-static int isl29018_suspend(struct device *dev)
-{
-	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
-
-	mutex_lock(&chip->lock);
-
-	/* Since this driver uses only polling commands, we are by default in
-	 * auto shutdown (ie, power-down) mode.
-	 * So we do not have much to do here.
-	 */
-	chip->suspended = true;
-
-	mutex_unlock(&chip->lock);
-	return 0;
-}
-
-static int isl29018_resume(struct device *dev)
-{
-	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
-	int err;
-
-	mutex_lock(&chip->lock);
-
-	err = isl29018_chip_init(chip);
-	if (!err)
-		chip->suspended = false;
-
-	mutex_unlock(&chip->lock);
-	return err;
-}
-
-static SIMPLE_DEV_PM_OPS(isl29018_pm_ops, isl29018_suspend, isl29018_resume);
-#define ISL29018_PM_OPS (&isl29018_pm_ops)
-#else
-#define ISL29018_PM_OPS NULL
-#endif
-
-static const struct acpi_device_id isl29018_acpi_match[] = {
-	{"ISL29018", isl29018},
-	{"ISL29023", isl29023},
-	{"ISL29035", isl29035},
-	{},
-};
-MODULE_DEVICE_TABLE(acpi, isl29018_acpi_match);
-
-static const struct i2c_device_id isl29018_id[] = {
-	{"isl29018", isl29018},
-	{"isl29023", isl29023},
-	{"isl29035", isl29035},
-	{}
-};
-
-MODULE_DEVICE_TABLE(i2c, isl29018_id);
-
-static const struct of_device_id isl29018_of_match[] = {
-	{ .compatible = "isil,isl29018", },
-	{ .compatible = "isil,isl29023", },
-	{ .compatible = "isil,isl29035", },
-	{ },
-};
-MODULE_DEVICE_TABLE(of, isl29018_of_match);
-
-static struct i2c_driver isl29018_driver = {
-	.driver	 = {
-			.name = "isl29018",
-			.acpi_match_table = ACPI_PTR(isl29018_acpi_match),
-			.pm = ISL29018_PM_OPS,
-			.of_match_table = isl29018_of_match,
-		    },
-	.probe	 = isl29018_probe,
-	.id_table = isl29018_id,
-};
-module_i2c_driver(isl29018_driver);
-
-MODULE_DESCRIPTION("ISL29018 Ambient Light Sensor driver");
-MODULE_LICENSE("GPL");
-- 
2.5.5

Re: [PATCH 4/4] staging: iio: isl29018: move out of staging

[Jonathan Cameron]

On 07/10/16 01:48, Brian Masney wrote:
> Move ISL29018/ISL29023/ISL29035 driver out of staging into mainline.
> 
> Signed-off-by: Brian Masney <masneyb@onstation.org>
Time for a nitpick tastic review ;)

The nature of a move out of staging patch is that we'll go over it
with the level of fine toothed comb we apply to a new submission.
A good part of my aim here is to ensure that once it's out it doesn't
get a lot of churn from whitespace or comment syntax patches etc.

I want to be able to ignore it for ever more and have it continue to
work perfectly and be beautiful code ;)

Anyhow, nothing of any significance at all in here, but it will need
a couple of precursor patches to clean up the loose ends before we
move it out of staging.

Thanks for doing this and sorry to bounce it back to you over such
trivial stuff!

Jonathan

p.s. I may let the next version sit for a little while on the list
anyway as these move out of staging patches often attract some
good reviews.

> ---
>  drivers/iio/light/Kconfig            |  12 +
>  drivers/iio/light/Makefile           |   1 +
>  drivers/iio/light/isl29018.c         | 847 +++++++++++++++++++++++++++++++++++
>  drivers/staging/iio/light/Kconfig    |  12 -
>  drivers/staging/iio/light/Makefile   |   1 -
>  drivers/staging/iio/light/isl29018.c | 847 -----------------------------------
>  6 files changed, 860 insertions(+), 860 deletions(-)
>  create mode 100644 drivers/iio/light/isl29018.c
>  delete mode 100644 drivers/staging/iio/light/isl29018.c
> 
> diff --git a/drivers/iio/light/Kconfig b/drivers/iio/light/Kconfig
> index ba2e64d..222a5ad 100644
> --- a/drivers/iio/light/Kconfig
> +++ b/drivers/iio/light/Kconfig
> @@ -140,6 +140,18 @@ config GP2AP020A00F
>  	  To compile this driver as a module, choose M here: the
>  	  module will be called gp2ap020a00f.
>  
> +config ISL29018
> +	tristate "ISL 29018 light and proximity sensor"
> +	depends on I2C
> +	select REGMAP_I2C
> +	default n
> +	help
> +	 If you say yes here you get support for ambient light sensing and
> +	 proximity infrared sensing from Intersil ISL29018.
> +	 This driver will provide the measurements of ambient light intensity
> +	 in lux, proximity infrared sensing and normal infrared sensing.
> +	 Data from sensor is accessible via sysfs.
> +
>  config ISL29125
>  	tristate "Intersil ISL29125 digital color light sensor"
>  	depends on I2C
> diff --git a/drivers/iio/light/Makefile b/drivers/iio/light/Makefile
> index c5768df..652240b 100644
> --- a/drivers/iio/light/Makefile
> +++ b/drivers/iio/light/Makefile
> @@ -17,6 +17,7 @@ obj-$(CONFIG_CM36651)		+= cm36651.o
>  obj-$(CONFIG_GP2AP020A00F)	+= gp2ap020a00f.o
>  obj-$(CONFIG_HID_SENSOR_ALS)	+= hid-sensor-als.o
>  obj-$(CONFIG_HID_SENSOR_PROX)	+= hid-sensor-prox.o
> +obj-$(CONFIG_ISL29018)		+= isl29018.o
>  obj-$(CONFIG_ISL29125)		+= isl29125.o
>  obj-$(CONFIG_JSA1212)		+= jsa1212.o
>  obj-$(CONFIG_SENSORS_LM3533)	+= lm3533-als.o
> diff --git a/drivers/iio/light/isl29018.c b/drivers/iio/light/isl29018.c
> new file mode 100644
> index 0000000..52bfb1cb
> --- /dev/null
> +++ b/drivers/iio/light/isl29018.c
> @@ -0,0 +1,847 @@
> +/*
> + * A iio driver for the light sensor ISL 29018/29023/29035.
> + *
> + * IIO driver for monitoring ambient light intensity in luxi, proximity
> + * sensing and infrared sensing.
> + *
> + * Copyright (c) 2010, NVIDIA Corporation.
> + *
> + * This program is free software; you can redistribute it and/or modify
> + * it under the terms of the GNU General Public License as published by
> + * the Free Software Foundation; either version 2 of the License, or
> + * (at your option) any later version.
> + *
> + * This program is distributed in the hope that it will be useful, but WITHOUT
> + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
> + * more details.
> + */
> +
> +#include <linux/module.h>
> +#include <linux/i2c.h>
> +#include <linux/err.h>
> +#include <linux/mutex.h>
> +#include <linux/delay.h>
> +#include <linux/regmap.h>
> +#include <linux/slab.h>
> +#include <linux/iio/iio.h>
> +#include <linux/iio/sysfs.h>
> +#include <linux/acpi.h>
> +
> +#define ISL29018_CONV_TIME_MS		100
> +
> +#define ISL29018_REG_ADD_COMMAND1	0x00
> +#define ISL29018_CMD1_OPMODE_SHIFT	5
> +#define ISL29018_CMD1_OPMODE_MASK	(7 << ISL29018_CMD1_OPMODE_SHIFT)
> +#define ISL29018_CMD1_OPMODE_POWER_DOWN	0
> +#define ISL29018_CMD1_OPMODE_ALS_ONCE	1
> +#define ISL29018_CMD1_OPMODE_IR_ONCE	2
> +#define ISL29018_CMD1_OPMODE_PROX_ONCE	3
> +
> +#define ISL29018_REG_ADD_COMMAND2	0x01
> +#define ISL29018_CMD2_RESOLUTION_SHIFT	2
> +#define ISL29018_CMD2_RESOLUTION_MASK	(0x3 << ISL29018_CMD2_RESOLUTION_SHIFT)
> +
> +#define ISL29018_CMD2_RANGE_SHIFT	0
> +#define ISL29018_CMD2_RANGE_MASK	(0x3 << ISL29018_CMD2_RANGE_SHIFT)
> +
> +#define ISL29018_CMD2_SCHEME_SHIFT	7
> +#define ISL29018_CMD2_SCHEME_MASK	(0x1 << ISL29018_CMD2_SCHEME_SHIFT)
> +
> +#define ISL29018_REG_ADD_DATA_LSB	0x02
> +#define ISL29018_REG_ADD_DATA_MSB	0x03
> +
> +#define ISL29018_REG_TEST		0x08
> +#define ISL29018_TEST_SHIFT		0
> +#define ISL29018_TEST_MASK		(0xFF << ISL29018_TEST_SHIFT)
> +
> +#define ISL29035_REG_DEVICE_ID		0x0F
> +#define ISL29035_DEVICE_ID_SHIFT	0x03
> +#define ISL29035_DEVICE_ID_MASK		(0x7 << ISL29035_DEVICE_ID_SHIFT)
> +#define ISL29035_DEVICE_ID		0x5
> +#define ISL29035_BOUT_SHIFT		0x07
> +#define ISL29035_BOUT_MASK		(0x01 << ISL29035_BOUT_SHIFT)
> +
> +enum isl29018_int_time {
> +	ISL29018_INT_TIME_16,
> +	ISL29018_INT_TIME_12,
> +	ISL29018_INT_TIME_8,
> +	ISL29018_INT_TIME_4,
> +};
> +
> +static const unsigned int isl29018_int_utimes[3][4] = {
> +	{90000, 5630, 351, 21},
> +	{90000, 5600, 352, 22},
> +	{105000, 6500, 410, 25},
> +};
> +
> +static const struct isl29018_scale {
> +	unsigned int scale;
> +	unsigned int uscale;
> +} isl29018_scales[4][4] = {
> +	{ {0, 15258}, {0, 61035}, {0, 244140}, {0, 976562} },
> +	{ {0, 244140}, {0, 976562}, {3, 906250}, {15, 625000} },
> +	{ {3, 906250}, {15, 625000}, {62, 500000}, {250, 0} },
> +	{ {62, 500000}, {250, 0}, {1000, 0}, {4000, 0} }
> +};
> +
> +struct isl29018_chip {
> +	struct regmap		*regmap;
> +	struct mutex		lock;
> +	int			type;
> +	unsigned int		calibscale;
> +	unsigned int		ucalibscale;
> +	unsigned int		int_time;
> +	struct isl29018_scale	scale;
> +	int			prox_scheme;
> +	bool			suspended;
> +};
> +
> +static int isl29018_set_integration_time(struct isl29018_chip *chip,
> +					 unsigned int utime)
> +{
> +	unsigned int i;
> +	int ret;
> +	unsigned int int_time, new_int_time;
> +
> +	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i) {
> +		if (utime == isl29018_int_utimes[chip->type][i]) {
> +			new_int_time = i;
> +			break;
> +		}
> +	}
> +
> +	if (i >= ARRAY_SIZE(isl29018_int_utimes[chip->type]))
> +		return -EINVAL;
> +
> +	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
> +				 ISL29018_CMD2_RESOLUTION_MASK,
> +				 i << ISL29018_CMD2_RESOLUTION_SHIFT);
> +	if (ret < 0)
> +		return ret;
> +
> +	/* Keep the same range when integration time changes */
> +	int_time = chip->int_time;
> +	for (i = 0; i < ARRAY_SIZE(isl29018_scales[int_time]); ++i) {
> +		if (chip->scale.scale == isl29018_scales[int_time][i].scale &&
> +		    chip->scale.uscale == isl29018_scales[int_time][i].uscale) {
> +			chip->scale = isl29018_scales[new_int_time][i];
> +			break;
> +		}
> +	}
> +	chip->int_time = new_int_time;
> +
> +	return 0;
> +}
> +
> +static int isl29018_set_scale(struct isl29018_chip *chip, int scale, int uscale)
> +{
> +	unsigned int i;
> +	int ret;
> +	struct isl29018_scale new_scale;
> +
> +	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i) {
> +		if (scale == isl29018_scales[chip->int_time][i].scale &&
> +		    uscale == isl29018_scales[chip->int_time][i].uscale) {
> +			new_scale = isl29018_scales[chip->int_time][i];
> +			break;
> +		}
> +	}
> +
> +	if (i >= ARRAY_SIZE(isl29018_scales[chip->int_time]))
> +		return -EINVAL;
> +
> +	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
> +				 ISL29018_CMD2_RANGE_MASK,
> +				 i << ISL29018_CMD2_RANGE_SHIFT);
> +	if (ret < 0)
> +		return ret;
> +
> +	chip->scale = new_scale;
> +
> +	return 0;
> +}
> +
> +static int isl29018_read_sensor_input(struct isl29018_chip *chip, int mode)
> +{
> +	int status;
> +	unsigned int lsb;
> +	unsigned int msb;
> +	struct device *dev = regmap_get_device(chip->regmap);
> +
> +	/* Set mode */
> +	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1,
> +			      mode << ISL29018_CMD1_OPMODE_SHIFT);
> +	if (status) {
> +		dev_err(dev,
> +			"Error in setting operating mode err %d\n", status);
> +		return status;
> +	}
> +	msleep(ISL29018_CONV_TIME_MS);
> +	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_LSB, &lsb);
> +	if (status < 0) {
> +		dev_err(dev,
> +			"Error in reading LSB DATA with err %d\n", status);
> +		return status;
> +	}
> +
> +	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_MSB, &msb);
> +	if (status < 0) {
> +		dev_err(dev,
> +			"Error in reading MSB DATA with error %d\n", status);
> +		return status;
> +	}
> +	dev_vdbg(dev, "MSB 0x%x and LSB 0x%x\n", msb, lsb);
> +
> +	return (msb << 8) | lsb;
> +}
> +
> +static int isl29018_read_lux(struct isl29018_chip *chip, int *lux)
> +{
> +	int lux_data;
> +	unsigned int data_x_range;
> +
> +	lux_data = isl29018_read_sensor_input(chip,
> +					      ISL29018_CMD1_OPMODE_ALS_ONCE);
> +	if (lux_data < 0)
> +		return lux_data;
> +
> +	data_x_range = lux_data * chip->scale.scale +
> +		       lux_data * chip->scale.uscale / 1000000;
> +	*lux = data_x_range * chip->calibscale +
> +	       data_x_range * chip->ucalibscale / 1000000;
> +
> +	return 0;
> +}
> +
> +static int isl29018_read_ir(struct isl29018_chip *chip, int *ir)
> +{
> +	int ir_data;
> +
> +	ir_data = isl29018_read_sensor_input(chip,
> +					     ISL29018_CMD1_OPMODE_IR_ONCE);
> +	if (ir_data < 0)
> +		return ir_data;
> +
> +	*ir = ir_data;
> +
> +	return 0;
> +}
> +
> +static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
> +				      int *near_ir)
> +{
> +	int status;
> +	int prox_data = -1;
> +	int ir_data = -1;
> +	struct device *dev = regmap_get_device(chip->regmap);
> +
> +	/* Do proximity sensing with required scheme */
> +	status = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
> +				    ISL29018_CMD2_SCHEME_MASK,
> +				    scheme << ISL29018_CMD2_SCHEME_SHIFT);
> +	if (status) {
> +		dev_err(dev, "Error in setting operating mode\n");
> +		return status;
> +	}
> +
> +	prox_data = isl29018_read_sensor_input(chip,
> +					       ISL29018_CMD1_OPMODE_PROX_ONCE);
> +	if (prox_data < 0)
> +		return prox_data;
> +
> +	if (scheme == 1) {
> +		*near_ir = prox_data;
> +		return 0;
> +	}
> +
> +	ir_data = isl29018_read_sensor_input(chip,
> +					     ISL29018_CMD1_OPMODE_IR_ONCE);
> +	if (ir_data < 0)
> +		return ir_data;
> +
> +	if (prox_data >= ir_data)
> +		*near_ir = prox_data - ir_data;
> +	else
> +		*near_ir = 0;
> +
> +	return 0;
> +}
> +
> +static ssize_t in_illuminance_scale_available_show
> +			(struct device *dev, struct device_attribute *attr,
> +			 char *buf)
> +{
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> +	struct isl29018_chip *chip = iio_priv(indio_dev);
> +	unsigned int i;
> +	int len = 0;
> +
> +	mutex_lock(&chip->lock);
> +	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i)
> +		len += sprintf(buf + len, "%d.%06d ",
> +			       isl29018_scales[chip->int_time][i].scale,
> +			       isl29018_scales[chip->int_time][i].uscale);
> +	mutex_unlock(&chip->lock);
> +
> +	buf[len - 1] = '\n';
> +
> +	return len;
> +}
> +
> +static ssize_t in_illuminance_integration_time_available_show
> +			(struct device *dev, struct device_attribute *attr,
> +			 char *buf)
> +{
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> +	struct isl29018_chip *chip = iio_priv(indio_dev);
> +	unsigned int i;
> +	int len = 0;
> +
> +	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i)
> +		len += sprintf(buf + len, "0.%06d ",
> +			       isl29018_int_utimes[chip->type][i]);
> +
> +	buf[len - 1] = '\n';
> +
> +	return len;
> +}
> +
> +/*
> + * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
> + * infrared suppression:
> + *
> + *   Proximity Sensing Scheme: Bit 7. This bit programs the function
> + * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
> + * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
> + * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
> + * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
> + * proximity_less_ambient detection. The range of Scheme 1
> + * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
> + * for resolutions less than 16. While Scheme 0 has wider dynamic
> + * range, Scheme 1 proximity detection is less affected by the
> + * ambient IR noise variation.
> + *
> + * 0 Sensing IR from LED and ambient
> + * 1 Sensing IR from LED with ambient IR rejection
> + */
> +static ssize_t proximity_on_chip_ambient_infrared_suppression_show
> +			(struct device *dev, struct device_attribute *attr,
> +			 char *buf)
> +{
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> +	struct isl29018_chip *chip = iio_priv(indio_dev);
> +
> +	/*
> +	 * Return the "proximity scheme" i.e. if the chip does on chip
> +	 * infrared suppression (1 means perform on chip suppression)
> +	 */
> +	return sprintf(buf, "%d\n", chip->prox_scheme);
> +}
> +
> +static ssize_t proximity_on_chip_ambient_infrared_suppression_store
> +			(struct device *dev, struct device_attribute *attr,
> +			 const char *buf, size_t count)
> +{
> +	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> +	struct isl29018_chip *chip = iio_priv(indio_dev);
> +	int val;
> +
> +	if (kstrtoint(buf, 10, &val))
> +		return -EINVAL;
> +	if (!(val == 0 || val == 1))
> +		return -EINVAL;
> +
> +	/*
> +	 * Get the "proximity scheme" i.e. if the chip does on chip
> +	 * infrared suppression (1 means perform on chip suppression)
> +	 */
> +	mutex_lock(&chip->lock);
> +	chip->prox_scheme = val;
> +	mutex_unlock(&chip->lock);
> +
> +	return count;
> +}
> +
> +static int isl29018_write_raw(struct iio_dev *indio_dev,
> +			      struct iio_chan_spec const *chan,
> +			      int val,
> +			      int val2,
> +			      long mask)
> +{
> +	struct isl29018_chip *chip = iio_priv(indio_dev);
> +	int ret = -EINVAL;
> +
> +	mutex_lock(&chip->lock);
> +	if (chip->suspended) {
> +		ret = -EBUSY;
> +		goto write_done;
> +	}
> +	switch (mask) {
> +	case IIO_CHAN_INFO_CALIBSCALE:
> +		if (chan->type == IIO_LIGHT) {
> +			chip->calibscale = val;
> +			chip->ucalibscale = val2;
> +			ret = 0;
> +		}
> +		break;
> +	case IIO_CHAN_INFO_INT_TIME:
> +		if (chan->type == IIO_LIGHT && !val)
> +			ret = isl29018_set_integration_time(chip, val2);
> +		break;
> +	case IIO_CHAN_INFO_SCALE:
> +		if (chan->type == IIO_LIGHT)
> +			ret = isl29018_set_scale(chip, val, val2);
> +		break;
> +	default:
> +		break;
> +	}
> +
> +write_done:
> +	mutex_unlock(&chip->lock);
blank line here.
> +	return ret;
> +}
> +
> +static int isl29018_read_raw(struct iio_dev *indio_dev,
> +			     struct iio_chan_spec const *chan,
> +			     int *val,
> +			     int *val2,
> +			     long mask)
> +{
> +	int ret = -EINVAL;
> +	struct isl29018_chip *chip = iio_priv(indio_dev);
> +
> +	mutex_lock(&chip->lock);
> +	if (chip->suspended) {
> +		ret = -EBUSY;
> +		goto read_done;
> +	}
> +	switch (mask) {
> +	case IIO_CHAN_INFO_RAW:
> +	case IIO_CHAN_INFO_PROCESSED:
> +		switch (chan->type) {
> +		case IIO_LIGHT:
> +			ret = isl29018_read_lux(chip, val);
> +			break;
> +		case IIO_INTENSITY:
> +			ret = isl29018_read_ir(chip, val);
> +			break;
> +		case IIO_PROXIMITY:
> +			ret = isl29018_read_proximity_ir(chip,
> +							 chip->prox_scheme,
> +							 val);
> +			break;
> +		default:
> +			break;
> +		}
> +		if (!ret)
> +			ret = IIO_VAL_INT;
> +		break;
> +	case IIO_CHAN_INFO_INT_TIME:
> +		if (chan->type == IIO_LIGHT) {
> +			*val = 0;
> +			*val2 = isl29018_int_utimes[chip->type][chip->int_time];
> +			ret = IIO_VAL_INT_PLUS_MICRO;
> +		}
> +		break;
> +	case IIO_CHAN_INFO_SCALE:
> +		if (chan->type == IIO_LIGHT) {
> +			*val = chip->scale.scale;
> +			*val2 = chip->scale.uscale;
> +			ret = IIO_VAL_INT_PLUS_MICRO;
> +		}
> +		break;
> +	case IIO_CHAN_INFO_CALIBSCALE:
> +		if (chan->type == IIO_LIGHT) {
> +			*val = chip->calibscale;
> +			*val2 = chip->ucalibscale;
> +			ret = IIO_VAL_INT_PLUS_MICRO;
> +		}
> +		break;
> +	default:
> +		break;
> +	}
> +
> +read_done:
> +	mutex_unlock(&chip->lock);
blank line here.
> +	return ret;
> +}
> +
> +#define ISL29018_LIGHT_CHANNEL {					\
> +	.type = IIO_LIGHT,						\
> +	.indexed = 1,							\
> +	.channel = 0,							\
> +	.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |		\
> +	BIT(IIO_CHAN_INFO_CALIBSCALE) |					\
> +	BIT(IIO_CHAN_INFO_SCALE) |					\
> +	BIT(IIO_CHAN_INFO_INT_TIME),					\
> +}
> +
> +#define ISL29018_IR_CHANNEL {						\
> +	.type = IIO_INTENSITY,						\
> +	.modified = 1,							\
> +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
> +	.channel2 = IIO_MOD_LIGHT_IR,					\
> +}
> +
> +#define ISL29018_PROXIMITY_CHANNEL {					\
> +	.type = IIO_PROXIMITY,						\
> +	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
> +}
> +
> +static const struct iio_chan_spec isl29018_channels[] = {
> +	ISL29018_LIGHT_CHANNEL,
> +	ISL29018_IR_CHANNEL,
> +	ISL29018_PROXIMITY_CHANNEL,
> +};
> +
> +static const struct iio_chan_spec isl29023_channels[] = {
> +	ISL29018_LIGHT_CHANNEL,
> +	ISL29018_IR_CHANNEL,
> +};
> +
> +static IIO_DEVICE_ATTR_RO(in_illuminance_integration_time_available, 0);
> +static IIO_DEVICE_ATTR_RO(in_illuminance_scale_available, 0);
> +static IIO_DEVICE_ATTR_RW(proximity_on_chip_ambient_infrared_suppression, 0);
> +
> +#define ISL29018_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
> +
> +static struct attribute *isl29018_attributes[] = {
> +	ISL29018_DEV_ATTR(in_illuminance_scale_available),
> +	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
> +	ISL29018_DEV_ATTR(proximity_on_chip_ambient_infrared_suppression),
> +	NULL
> +};
> +
> +static struct attribute *isl29023_attributes[] = {
> +	ISL29018_DEV_ATTR(in_illuminance_scale_available),
> +	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
> +	NULL
> +};
> +
> +static const struct attribute_group isl29018_group = {
> +	.attrs = isl29018_attributes,
> +};
> +
> +static const struct attribute_group isl29023_group = {
> +	.attrs = isl29023_attributes,
> +};
> +
> +static int isl29035_detect(struct isl29018_chip *chip)
> +{
This isn't just doing chip detection.  I'd drop the separate function
and just have the code in init directly.  Will be cleaner and get
rid of the naming confusion for this function.
> +	int status;
> +	unsigned int id;
> +	struct device *dev = regmap_get_device(chip->regmap);
> +
> +	status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
> +	if (status < 0) {
> +		dev_err(dev,
> +			"Error reading ID register with error %d\n",
> +			status);
> +		return status;
> +	}
> +
> +	id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
> +
> +	if (id != ISL29035_DEVICE_ID)
> +		return -ENODEV;
> +
> +	/* Clear brownout bit */
> +	return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
> +				  ISL29035_BOUT_MASK, 0);
> +}
> +
> +enum {
> +	isl29018,
> +	isl29023,
> +	isl29035,
> +};
> +
> +static int isl29018_chip_init(struct isl29018_chip *chip)
> +{
> +	int status;
> +	struct device *dev = regmap_get_device(chip->regmap);
> +
> +	if (chip->type == isl29035) {
> +		status = isl29035_detect(chip);
> +		if (status < 0)
> +			return status;
> +	}
> +
> +	/* Code added per Intersil Application Note 1534:
> +	 *     When VDD sinks to approximately 1.8V or below, some of
> +	 * the part's registers may change their state. When VDD
> +	 * recovers to 2.25V (or greater), the part may thus be in an
> +	 * unknown mode of operation. The user can return the part to
> +	 * a known mode of operation either by (a) setting VDD = 0V for
> +	 * 1 second or more and then powering back up with a slew rate
> +	 * of 0.5V/ms or greater, or (b) via I2C disable all ALS/PROX
> +	 * conversions, clear the test registers, and then rewrite all
> +	 * registers to the desired values.
> +	 * ...
> +	 * For ISL29011, ISL29018, ISL29021, ISL29023
> +	 * 1. Write 0x00 to register 0x08 (TEST)
> +	 * 2. Write 0x00 to register 0x00 (CMD1)
> +	 * 3. Rewrite all registers to the desired values
> +	 *
> +	 * ISL29018 Data Sheet (FN6619.1, Feb 11, 2010) essentially says
> +	 * the same thing EXCEPT the data sheet asks for a 1ms delay after
> +	 * writing the CMD1 register.
> +	 */
> +	status = regmap_write(chip->regmap, ISL29018_REG_TEST, 0x0);
> +	if (status < 0) {
> +		dev_err(dev, "Failed to clear isl29018 TEST reg.(%d)\n",
> +			status);
> +		return status;
> +	}
> +
Multiline comment syntax.  Please fix throughout. Not going to comment on
this again.
> +	/* See Intersil AN1534 comments above.
> +	 * "Operating Mode" (COMMAND1) register is reprogrammed when
> +	 * data is read from the device.
> +	 */
> +	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1, 0);
> +	if (status < 0) {
> +		dev_err(dev, "Failed to clear isl29018 CMD1 reg.(%d)\n",
> +			status);
> +		return status;
> +	}
> +
> +	usleep_range(1000, 2000);	/* per data sheet, page 10 */
> +
> +	/* Set defaults */
> +	status = isl29018_set_scale(chip, chip->scale.scale,
> +				    chip->scale.uscale);
> +	if (status < 0) {
> +		dev_err(dev, "Init of isl29018 fails\n");
> +		return status;
> +	}
> +
> +	status = isl29018_set_integration_time(chip,
> +			isl29018_int_utimes[chip->type][chip->int_time]);
> +	if (status < 0) {
> +		dev_err(dev, "Init of isl29018 fails\n");
> +		return status;
Drop the return status out of the if (status < 0) and get rid of
the return 0.  One of the varous static checkers picks up on this so we'll
get someone doing it shortly anyway and it's a worthwhile little tweak so
let's do it now.
> +	}
> +
> +	return 0;
> +}
> +
> +static const struct iio_info isl29018_info = {
> +	.attrs = &isl29018_group,
> +	.driver_module = THIS_MODULE,
> +	.read_raw = isl29018_read_raw,
> +	.write_raw = isl29018_write_raw,
> +};
> +
> +static const struct iio_info isl29023_info = {
> +	.attrs = &isl29023_group,
> +	.driver_module = THIS_MODULE,
> +	.read_raw = isl29018_read_raw,
> +	.write_raw = isl29018_write_raw,
> +};
> +
> +static bool isl29018_is_volatile_reg(struct device *dev, unsigned int reg)
> +{
> +	switch (reg) {
> +	case ISL29018_REG_ADD_DATA_LSB:
> +	case ISL29018_REG_ADD_DATA_MSB:
> +	case ISL29018_REG_ADD_COMMAND1:
> +	case ISL29018_REG_TEST:
> +	case ISL29035_REG_DEVICE_ID:
> +		return true;
> +	default:
> +		return false;
> +	}
> +}
> +
> +static const struct regmap_config isl29018_regmap_config = {
> +	.reg_bits = 8,
> +	.val_bits = 8,
> +	.volatile_reg = isl29018_is_volatile_reg,
> +	.max_register = ISL29018_REG_TEST,
> +	.num_reg_defaults_raw = ISL29018_REG_TEST + 1,
> +	.cache_type = REGCACHE_RBTREE,
> +};
> +
> +static const struct regmap_config isl29035_regmap_config = {
> +	.reg_bits = 8,
> +	.val_bits = 8,
> +	.volatile_reg = isl29018_is_volatile_reg,
> +	.max_register = ISL29035_REG_DEVICE_ID,
> +	.num_reg_defaults_raw = ISL29035_REG_DEVICE_ID + 1,
> +	.cache_type = REGCACHE_RBTREE,
> +};
> +
> +struct isl29018_chip_info {
> +	const struct iio_chan_spec *channels;
> +	int num_channels;
> +	const struct iio_info *indio_info;
> +	const struct regmap_config *regmap_cfg;
> +};
> +
> +static const struct isl29018_chip_info isl29018_chip_info_tbl[] = {
> +	[isl29018] = {
> +		.channels = isl29018_channels,
> +		.num_channels = ARRAY_SIZE(isl29018_channels),
> +		.indio_info = &isl29018_info,
> +		.regmap_cfg = &isl29018_regmap_config,
> +	},
> +	[isl29023] = {
> +		.channels = isl29023_channels,
> +		.num_channels = ARRAY_SIZE(isl29023_channels),
> +		.indio_info = &isl29023_info,
> +		.regmap_cfg = &isl29018_regmap_config,
> +	},
> +	[isl29035] = {
> +		.channels = isl29023_channels,
> +		.num_channels = ARRAY_SIZE(isl29023_channels),
> +		.indio_info = &isl29023_info,
> +		.regmap_cfg = &isl29035_regmap_config,
> +	},
> +};
> +
> +static const char *isl29018_match_acpi_device(struct device *dev, int *data)
> +{
> +	const struct acpi_device_id *id;
> +
> +	id = acpi_match_device(dev->driver->acpi_match_table, dev);
> +
> +	if (!id)
> +		return NULL;
> +
> +	*data = (int)id->driver_data;
> +
> +	return dev_name(dev);
> +}
> +
> +static int isl29018_probe(struct i2c_client *client,
> +			  const struct i2c_device_id *id)
> +{
> +	struct isl29018_chip *chip;
> +	struct iio_dev *indio_dev;
> +	int err;
> +	const char *name = NULL;
> +	int dev_id = 0;
> +
> +	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
> +	if (!indio_dev)
> +		return -ENOMEM;
I'd throw in a blank line here for readability.
> +	chip = iio_priv(indio_dev);
> +
> +	i2c_set_clientdata(client, indio_dev);
> +
> +	if (id) {
> +		name = id->name;
> +		dev_id = id->driver_data;
> +	}
> +
> +	if (ACPI_HANDLE(&client->dev))
> +		name = isl29018_match_acpi_device(&client->dev, &dev_id);
> +
> +	mutex_init(&chip->lock);
> +
> +	chip->type = dev_id;
> +	chip->calibscale = 1;
> +	chip->ucalibscale = 0;
> +	chip->int_time = ISL29018_INT_TIME_16;
> +	chip->scale = isl29018_scales[chip->int_time][0];
> +	chip->suspended = false;
> +
> +	chip->regmap = devm_regmap_init_i2c(client,
> +				isl29018_chip_info_tbl[dev_id].regmap_cfg);
> +	if (IS_ERR(chip->regmap)) {
> +		err = PTR_ERR(chip->regmap);
> +		dev_err(&client->dev, "regmap initialization fails: %d\n", err);
> +		return err;
> +	}
> +
> +	err = isl29018_chip_init(chip);
> +	if (err)
> +		return err;
> +
> +	indio_dev->info = isl29018_chip_info_tbl[dev_id].indio_info;
> +	indio_dev->channels = isl29018_chip_info_tbl[dev_id].channels;
> +	indio_dev->num_channels = isl29018_chip_info_tbl[dev_id].num_channels;
> +	indio_dev->name = name;
> +	indio_dev->dev.parent = &client->dev;
> +	indio_dev->modes = INDIO_DIRECT_MODE;
> +	return devm_iio_device_register(&client->dev, indio_dev);
> +}
> +
> +#ifdef CONFIG_PM_SLEEP
> +static int isl29018_suspend(struct device *dev)
> +{
> +	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
> +
> +	mutex_lock(&chip->lock);
> +
Not quite kernel multiline comment syntax.
> +	/* Since this driver uses only polling commands, we are by default in
> +	 * auto shutdown (ie, power-down) mode.
> +	 * So we do not have much to do here.
> +	 */
> +	chip->suspended = true;
> +
> +	mutex_unlock(&chip->lock);
blank line here.
> +	return 0;
> +}
> +
> +static int isl29018_resume(struct device *dev)
> +{
> +	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
> +	int err;
> +
> +	mutex_lock(&chip->lock);
> +
> +	err = isl29018_chip_init(chip);
> +	if (!err)
> +		chip->suspended = false;
> +
> +	mutex_unlock(&chip->lock);
blank line here.
> +	return err;
> +}
> +
> +static SIMPLE_DEV_PM_OPS(isl29018_pm_ops, isl29018_suspend, isl29018_resume);
> +#define ISL29018_PM_OPS (&isl29018_pm_ops)
> +#else
> +#define ISL29018_PM_OPS NULL
> +#endif
> +
> +static const struct acpi_device_id isl29018_acpi_match[] = {
> +	{"ISL29018", isl29018},
> +	{"ISL29023", isl29023},
> +	{"ISL29035", isl29035},
> +	{},
> +};
> +MODULE_DEVICE_TABLE(acpi, isl29018_acpi_match);
> +
> +static const struct i2c_device_id isl29018_id[] = {
> +	{"isl29018", isl29018},
> +	{"isl29023", isl29023},
> +	{"isl29035", isl29035},
> +	{}
> +};
> +
Consistency would say no line break here.
> +MODULE_DEVICE_TABLE(i2c, isl29018_id);
> +
> +static const struct of_device_id isl29018_of_match[] = {
> +	{ .compatible = "isil,isl29018", },
> +	{ .compatible = "isil,isl29023", },
> +	{ .compatible = "isil,isl29035", },
> +	{ },
> +};
> +MODULE_DEVICE_TABLE(of, isl29018_of_match);
> +
> +static struct i2c_driver isl29018_driver = {
> +	.driver	 = {
> +			.name = "isl29018",
> +			.acpi_match_table = ACPI_PTR(isl29018_acpi_match),
> +			.pm = ISL29018_PM_OPS,
> +			.of_match_table = isl29018_of_match,
> +		    },
> +	.probe	 = isl29018_probe,
> +	.id_table = isl29018_id,
> +};
> +module_i2c_driver(isl29018_driver);
> +
> +MODULE_DESCRIPTION("ISL29018 Ambient Light Sensor driver");
> +MODULE_LICENSE("GPL");
> diff --git a/drivers/staging/iio/light/Kconfig b/drivers/staging/iio/light/Kconfig
> index b0e2948..dbf22d3 100644
> --- a/drivers/staging/iio/light/Kconfig
> +++ b/drivers/staging/iio/light/Kconfig
> @@ -3,18 +3,6 @@
>  #
>  menu "Light sensors"
>  
> -config ISL29018
> -	tristate "ISL 29018 light and proximity sensor"
> -	depends on I2C
> -	select REGMAP_I2C
> -	default n
> -	help
> -	 If you say yes here you get support for ambient light sensing and
> -	 proximity infrared sensing from Intersil ISL29018.
> -	 This driver will provide the measurements of ambient light intensity
> -	 in lux, proximity infrared sensing and normal infrared sensing.
> -	 Data from sensor is accessible via sysfs.
> -
>  config SENSORS_ISL29028
>  	tristate "Intersil ISL29028 Concurrent Light and Proximity Sensor"
>  	depends on I2C
> diff --git a/drivers/staging/iio/light/Makefile b/drivers/staging/iio/light/Makefile
> index 89d6b02..6480856 100644
> --- a/drivers/staging/iio/light/Makefile
> +++ b/drivers/staging/iio/light/Makefile
> @@ -2,7 +2,6 @@
>  # Makefile for industrial I/O Light sensors
>  #
>  
> -obj-$(CONFIG_ISL29018)	+= isl29018.o
>  obj-$(CONFIG_SENSORS_ISL29028)	+= isl29028.o
>  obj-$(CONFIG_TSL2583)	+= tsl2583.o
>  obj-$(CONFIG_TSL2x7x)	+= tsl2x7x_core.o
> diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
> deleted file mode 100644
> index 52bfb1cb..0000000
> --- a/drivers/staging/iio/light/isl29018.c
> +++ /dev/null
> @@ -1,847 +0,0 @@
> -/*
> - * A iio driver for the light sensor ISL 29018/29023/29035.
> - *
> - * IIO driver for monitoring ambient light intensity in luxi, proximity
> - * sensing and infrared sensing.
> - *
> - * Copyright (c) 2010, NVIDIA Corporation.
> - *
> - * This program is free software; you can redistribute it and/or modify
> - * it under the terms of the GNU General Public License as published by
> - * the Free Software Foundation; either version 2 of the License, or
> - * (at your option) any later version.
> - *
> - * This program is distributed in the hope that it will be useful, but WITHOUT
> - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
> - * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
> - * more details.
> - */
> -
> -#include <linux/module.h>
> -#include <linux/i2c.h>
> -#include <linux/err.h>
> -#include <linux/mutex.h>
> -#include <linux/delay.h>
> -#include <linux/regmap.h>
> -#include <linux/slab.h>
> -#include <linux/iio/iio.h>
> -#include <linux/iio/sysfs.h>
> -#include <linux/acpi.h>
> -
> -#define ISL29018_CONV_TIME_MS		100
> -
> -#define ISL29018_REG_ADD_COMMAND1	0x00
> -#define ISL29018_CMD1_OPMODE_SHIFT	5
> -#define ISL29018_CMD1_OPMODE_MASK	(7 << ISL29018_CMD1_OPMODE_SHIFT)
> -#define ISL29018_CMD1_OPMODE_POWER_DOWN	0
> -#define ISL29018_CMD1_OPMODE_ALS_ONCE	1
> -#define ISL29018_CMD1_OPMODE_IR_ONCE	2
> -#define ISL29018_CMD1_OPMODE_PROX_ONCE	3
> -
> -#define ISL29018_REG_ADD_COMMAND2	0x01
> -#define ISL29018_CMD2_RESOLUTION_SHIFT	2
> -#define ISL29018_CMD2_RESOLUTION_MASK	(0x3 << ISL29018_CMD2_RESOLUTION_SHIFT)
> -
> -#define ISL29018_CMD2_RANGE_SHIFT	0
> -#define ISL29018_CMD2_RANGE_MASK	(0x3 << ISL29018_CMD2_RANGE_SHIFT)
> -
> -#define ISL29018_CMD2_SCHEME_SHIFT	7
> -#define ISL29018_CMD2_SCHEME_MASK	(0x1 << ISL29018_CMD2_SCHEME_SHIFT)
> -
> -#define ISL29018_REG_ADD_DATA_LSB	0x02
> -#define ISL29018_REG_ADD_DATA_MSB	0x03
> -
> -#define ISL29018_REG_TEST		0x08
> -#define ISL29018_TEST_SHIFT		0
> -#define ISL29018_TEST_MASK		(0xFF << ISL29018_TEST_SHIFT)
> -
> -#define ISL29035_REG_DEVICE_ID		0x0F
> -#define ISL29035_DEVICE_ID_SHIFT	0x03
> -#define ISL29035_DEVICE_ID_MASK		(0x7 << ISL29035_DEVICE_ID_SHIFT)
> -#define ISL29035_DEVICE_ID		0x5
> -#define ISL29035_BOUT_SHIFT		0x07
> -#define ISL29035_BOUT_MASK		(0x01 << ISL29035_BOUT_SHIFT)
> -
> -enum isl29018_int_time {
> -	ISL29018_INT_TIME_16,
> -	ISL29018_INT_TIME_12,
> -	ISL29018_INT_TIME_8,
> -	ISL29018_INT_TIME_4,
> -};
> -
> -static const unsigned int isl29018_int_utimes[3][4] = {
> -	{90000, 5630, 351, 21},
> -	{90000, 5600, 352, 22},
> -	{105000, 6500, 410, 25},
> -};
> -
> -static const struct isl29018_scale {
> -	unsigned int scale;
> -	unsigned int uscale;
> -} isl29018_scales[4][4] = {
> -	{ {0, 15258}, {0, 61035}, {0, 244140}, {0, 976562} },
> -	{ {0, 244140}, {0, 976562}, {3, 906250}, {15, 625000} },
> -	{ {3, 906250}, {15, 625000}, {62, 500000}, {250, 0} },
> -	{ {62, 500000}, {250, 0}, {1000, 0}, {4000, 0} }
> -};
> -
> -struct isl29018_chip {
> -	struct regmap		*regmap;
> -	struct mutex		lock;
> -	int			type;
> -	unsigned int		calibscale;
> -	unsigned int		ucalibscale;
> -	unsigned int		int_time;
> -	struct isl29018_scale	scale;
> -	int			prox_scheme;
> -	bool			suspended;
> -};
> -
> -static int isl29018_set_integration_time(struct isl29018_chip *chip,
> -					 unsigned int utime)
> -{
> -	unsigned int i;
> -	int ret;
> -	unsigned int int_time, new_int_time;
> -
> -	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i) {
> -		if (utime == isl29018_int_utimes[chip->type][i]) {
> -			new_int_time = i;
> -			break;
> -		}
> -	}
> -
> -	if (i >= ARRAY_SIZE(isl29018_int_utimes[chip->type]))
> -		return -EINVAL;
> -
> -	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
> -				 ISL29018_CMD2_RESOLUTION_MASK,
> -				 i << ISL29018_CMD2_RESOLUTION_SHIFT);
> -	if (ret < 0)
> -		return ret;
> -
> -	/* Keep the same range when integration time changes */
> -	int_time = chip->int_time;
> -	for (i = 0; i < ARRAY_SIZE(isl29018_scales[int_time]); ++i) {
> -		if (chip->scale.scale == isl29018_scales[int_time][i].scale &&
> -		    chip->scale.uscale == isl29018_scales[int_time][i].uscale) {
> -			chip->scale = isl29018_scales[new_int_time][i];
> -			break;
> -		}
> -	}
> -	chip->int_time = new_int_time;
> -
> -	return 0;
> -}
> -
> -static int isl29018_set_scale(struct isl29018_chip *chip, int scale, int uscale)
> -{
> -	unsigned int i;
> -	int ret;
> -	struct isl29018_scale new_scale;
> -
> -	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i) {
> -		if (scale == isl29018_scales[chip->int_time][i].scale &&
> -		    uscale == isl29018_scales[chip->int_time][i].uscale) {
> -			new_scale = isl29018_scales[chip->int_time][i];
> -			break;
> -		}
> -	}
> -
> -	if (i >= ARRAY_SIZE(isl29018_scales[chip->int_time]))
> -		return -EINVAL;
> -
> -	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
> -				 ISL29018_CMD2_RANGE_MASK,
> -				 i << ISL29018_CMD2_RANGE_SHIFT);
> -	if (ret < 0)
> -		return ret;
> -
> -	chip->scale = new_scale;
> -
> -	return 0;
> -}
> -
> -static int isl29018_read_sensor_input(struct isl29018_chip *chip, int mode)
> -{
> -	int status;
> -	unsigned int lsb;
> -	unsigned int msb;
> -	struct device *dev = regmap_get_device(chip->regmap);
> -
> -	/* Set mode */
> -	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1,
> -			      mode << ISL29018_CMD1_OPMODE_SHIFT);
> -	if (status) {
> -		dev_err(dev,
> -			"Error in setting operating mode err %d\n", status);
> -		return status;
> -	}
> -	msleep(ISL29018_CONV_TIME_MS);
> -	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_LSB, &lsb);
> -	if (status < 0) {
> -		dev_err(dev,
> -			"Error in reading LSB DATA with err %d\n", status);
> -		return status;
> -	}
> -
> -	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_MSB, &msb);
> -	if (status < 0) {
> -		dev_err(dev,
> -			"Error in reading MSB DATA with error %d\n", status);
> -		return status;
> -	}
> -	dev_vdbg(dev, "MSB 0x%x and LSB 0x%x\n", msb, lsb);
> -
> -	return (msb << 8) | lsb;
> -}
> -
> -static int isl29018_read_lux(struct isl29018_chip *chip, int *lux)
> -{
> -	int lux_data;
> -	unsigned int data_x_range;
> -
> -	lux_data = isl29018_read_sensor_input(chip,
> -					      ISL29018_CMD1_OPMODE_ALS_ONCE);
> -	if (lux_data < 0)
> -		return lux_data;
> -
> -	data_x_range = lux_data * chip->scale.scale +
> -		       lux_data * chip->scale.uscale / 1000000;
> -	*lux = data_x_range * chip->calibscale +
> -	       data_x_range * chip->ucalibscale / 1000000;
> -
> -	return 0;
> -}
> -
> -static int isl29018_read_ir(struct isl29018_chip *chip, int *ir)
> -{
> -	int ir_data;
> -
> -	ir_data = isl29018_read_sensor_input(chip,
> -					     ISL29018_CMD1_OPMODE_IR_ONCE);
> -	if (ir_data < 0)
> -		return ir_data;
> -
> -	*ir = ir_data;
> -
> -	return 0;
> -}
> -
> -static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme,
> -				      int *near_ir)
> -{
> -	int status;
> -	int prox_data = -1;
> -	int ir_data = -1;
> -	struct device *dev = regmap_get_device(chip->regmap);
> -
> -	/* Do proximity sensing with required scheme */
> -	status = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,
> -				    ISL29018_CMD2_SCHEME_MASK,
> -				    scheme << ISL29018_CMD2_SCHEME_SHIFT);
> -	if (status) {
> -		dev_err(dev, "Error in setting operating mode\n");
> -		return status;
> -	}
> -
> -	prox_data = isl29018_read_sensor_input(chip,
> -					       ISL29018_CMD1_OPMODE_PROX_ONCE);
> -	if (prox_data < 0)
> -		return prox_data;
> -
> -	if (scheme == 1) {
> -		*near_ir = prox_data;
> -		return 0;
> -	}
> -
> -	ir_data = isl29018_read_sensor_input(chip,
> -					     ISL29018_CMD1_OPMODE_IR_ONCE);
> -	if (ir_data < 0)
> -		return ir_data;
> -
> -	if (prox_data >= ir_data)
> -		*near_ir = prox_data - ir_data;
> -	else
> -		*near_ir = 0;
> -
> -	return 0;
> -}
> -
> -static ssize_t in_illuminance_scale_available_show
> -			(struct device *dev, struct device_attribute *attr,
> -			 char *buf)
> -{
> -	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> -	struct isl29018_chip *chip = iio_priv(indio_dev);
> -	unsigned int i;
> -	int len = 0;
> -
> -	mutex_lock(&chip->lock);
> -	for (i = 0; i < ARRAY_SIZE(isl29018_scales[chip->int_time]); ++i)
> -		len += sprintf(buf + len, "%d.%06d ",
> -			       isl29018_scales[chip->int_time][i].scale,
> -			       isl29018_scales[chip->int_time][i].uscale);
> -	mutex_unlock(&chip->lock);
> -
> -	buf[len - 1] = '\n';
> -
> -	return len;
> -}
> -
> -static ssize_t in_illuminance_integration_time_available_show
> -			(struct device *dev, struct device_attribute *attr,
> -			 char *buf)
> -{
> -	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> -	struct isl29018_chip *chip = iio_priv(indio_dev);
> -	unsigned int i;
> -	int len = 0;
> -
> -	for (i = 0; i < ARRAY_SIZE(isl29018_int_utimes[chip->type]); ++i)
> -		len += sprintf(buf + len, "0.%06d ",
> -			       isl29018_int_utimes[chip->type][i]);
> -
> -	buf[len - 1] = '\n';
> -
> -	return len;
> -}
> -
> -/*
> - * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
> - * infrared suppression:
> - *
> - *   Proximity Sensing Scheme: Bit 7. This bit programs the function
> - * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
> - * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
> - * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
> - * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
> - * proximity_less_ambient detection. The range of Scheme 1
> - * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
> - * for resolutions less than 16. While Scheme 0 has wider dynamic
> - * range, Scheme 1 proximity detection is less affected by the
> - * ambient IR noise variation.
> - *
> - * 0 Sensing IR from LED and ambient
> - * 1 Sensing IR from LED with ambient IR rejection
> - */
> -static ssize_t proximity_on_chip_ambient_infrared_suppression_show
> -			(struct device *dev, struct device_attribute *attr,
> -			 char *buf)
> -{
> -	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> -	struct isl29018_chip *chip = iio_priv(indio_dev);
> -
> -	/*
> -	 * Return the "proximity scheme" i.e. if the chip does on chip
> -	 * infrared suppression (1 means perform on chip suppression)
> -	 */
> -	return sprintf(buf, "%d\n", chip->prox_scheme);
> -}
> -
> -static ssize_t proximity_on_chip_ambient_infrared_suppression_store
> -			(struct device *dev, struct device_attribute *attr,
> -			 const char *buf, size_t count)
> -{
> -	struct iio_dev *indio_dev = dev_to_iio_dev(dev);
> -	struct isl29018_chip *chip = iio_priv(indio_dev);
> -	int val;
> -
> -	if (kstrtoint(buf, 10, &val))
> -		return -EINVAL;
> -	if (!(val == 0 || val == 1))
> -		return -EINVAL;
> -
> -	/*
> -	 * Get the "proximity scheme" i.e. if the chip does on chip
> -	 * infrared suppression (1 means perform on chip suppression)
> -	 */
> -	mutex_lock(&chip->lock);
> -	chip->prox_scheme = val;
> -	mutex_unlock(&chip->lock);
> -
> -	return count;
> -}
> -
> -static int isl29018_write_raw(struct iio_dev *indio_dev,
> -			      struct iio_chan_spec const *chan,
> -			      int val,
> -			      int val2,
> -			      long mask)
> -{
> -	struct isl29018_chip *chip = iio_priv(indio_dev);
> -	int ret = -EINVAL;
> -
> -	mutex_lock(&chip->lock);
> -	if (chip->suspended) {
> -		ret = -EBUSY;
> -		goto write_done;
> -	}
> -	switch (mask) {
> -	case IIO_CHAN_INFO_CALIBSCALE:
> -		if (chan->type == IIO_LIGHT) {
> -			chip->calibscale = val;
> -			chip->ucalibscale = val2;
> -			ret = 0;
> -		}
> -		break;
> -	case IIO_CHAN_INFO_INT_TIME:
> -		if (chan->type == IIO_LIGHT && !val)
> -			ret = isl29018_set_integration_time(chip, val2);
> -		break;
> -	case IIO_CHAN_INFO_SCALE:
> -		if (chan->type == IIO_LIGHT)
> -			ret = isl29018_set_scale(chip, val, val2);
> -		break;
> -	default:
> -		break;
> -	}
> -
> -write_done:
> -	mutex_unlock(&chip->lock);
> -	return ret;
> -}
> -
> -static int isl29018_read_raw(struct iio_dev *indio_dev,
> -			     struct iio_chan_spec const *chan,
> -			     int *val,
> -			     int *val2,
> -			     long mask)
> -{
> -	int ret = -EINVAL;
> -	struct isl29018_chip *chip = iio_priv(indio_dev);
> -
> -	mutex_lock(&chip->lock);
> -	if (chip->suspended) {
> -		ret = -EBUSY;
> -		goto read_done;
> -	}
> -	switch (mask) {
> -	case IIO_CHAN_INFO_RAW:
> -	case IIO_CHAN_INFO_PROCESSED:
> -		switch (chan->type) {
> -		case IIO_LIGHT:
> -			ret = isl29018_read_lux(chip, val);
> -			break;
> -		case IIO_INTENSITY:
> -			ret = isl29018_read_ir(chip, val);
> -			break;
> -		case IIO_PROXIMITY:
> -			ret = isl29018_read_proximity_ir(chip,
> -							 chip->prox_scheme,
> -							 val);
> -			break;
> -		default:
> -			break;
> -		}
> -		if (!ret)
> -			ret = IIO_VAL_INT;
> -		break;
> -	case IIO_CHAN_INFO_INT_TIME:
> -		if (chan->type == IIO_LIGHT) {
> -			*val = 0;
> -			*val2 = isl29018_int_utimes[chip->type][chip->int_time];
> -			ret = IIO_VAL_INT_PLUS_MICRO;
> -		}
> -		break;
> -	case IIO_CHAN_INFO_SCALE:
> -		if (chan->type == IIO_LIGHT) {
> -			*val = chip->scale.scale;
> -			*val2 = chip->scale.uscale;
> -			ret = IIO_VAL_INT_PLUS_MICRO;
> -		}
> -		break;
> -	case IIO_CHAN_INFO_CALIBSCALE:
> -		if (chan->type == IIO_LIGHT) {
> -			*val = chip->calibscale;
> -			*val2 = chip->ucalibscale;
> -			ret = IIO_VAL_INT_PLUS_MICRO;
> -		}
> -		break;
> -	default:
> -		break;
> -	}
> -
> -read_done:
> -	mutex_unlock(&chip->lock);
> -	return ret;
> -}
> -
> -#define ISL29018_LIGHT_CHANNEL {					\
> -	.type = IIO_LIGHT,						\
> -	.indexed = 1,							\
> -	.channel = 0,							\
> -	.info_mask_separate = BIT(IIO_CHAN_INFO_PROCESSED) |		\
> -	BIT(IIO_CHAN_INFO_CALIBSCALE) |					\
> -	BIT(IIO_CHAN_INFO_SCALE) |					\
> -	BIT(IIO_CHAN_INFO_INT_TIME),					\
> -}
> -
> -#define ISL29018_IR_CHANNEL {						\
> -	.type = IIO_INTENSITY,						\
> -	.modified = 1,							\
> -	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
> -	.channel2 = IIO_MOD_LIGHT_IR,					\
> -}
> -
> -#define ISL29018_PROXIMITY_CHANNEL {					\
> -	.type = IIO_PROXIMITY,						\
> -	.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),			\
> -}
> -
> -static const struct iio_chan_spec isl29018_channels[] = {
> -	ISL29018_LIGHT_CHANNEL,
> -	ISL29018_IR_CHANNEL,
> -	ISL29018_PROXIMITY_CHANNEL,
> -};
> -
> -static const struct iio_chan_spec isl29023_channels[] = {
> -	ISL29018_LIGHT_CHANNEL,
> -	ISL29018_IR_CHANNEL,
> -};
> -
> -static IIO_DEVICE_ATTR_RO(in_illuminance_integration_time_available, 0);
> -static IIO_DEVICE_ATTR_RO(in_illuminance_scale_available, 0);
> -static IIO_DEVICE_ATTR_RW(proximity_on_chip_ambient_infrared_suppression, 0);
> -
> -#define ISL29018_DEV_ATTR(name) (&iio_dev_attr_##name.dev_attr.attr)
> -
> -static struct attribute *isl29018_attributes[] = {
> -	ISL29018_DEV_ATTR(in_illuminance_scale_available),
> -	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
> -	ISL29018_DEV_ATTR(proximity_on_chip_ambient_infrared_suppression),
> -	NULL
> -};
> -
> -static struct attribute *isl29023_attributes[] = {
> -	ISL29018_DEV_ATTR(in_illuminance_scale_available),
> -	ISL29018_DEV_ATTR(in_illuminance_integration_time_available),
> -	NULL
> -};
> -
> -static const struct attribute_group isl29018_group = {
> -	.attrs = isl29018_attributes,
> -};
> -
> -static const struct attribute_group isl29023_group = {
> -	.attrs = isl29023_attributes,
> -};
> -
> -static int isl29035_detect(struct isl29018_chip *chip)
> -{
> -	int status;
> -	unsigned int id;
> -	struct device *dev = regmap_get_device(chip->regmap);
> -
> -	status = regmap_read(chip->regmap, ISL29035_REG_DEVICE_ID, &id);
> -	if (status < 0) {
> -		dev_err(dev,
> -			"Error reading ID register with error %d\n",
> -			status);
> -		return status;
> -	}
> -
> -	id = (id & ISL29035_DEVICE_ID_MASK) >> ISL29035_DEVICE_ID_SHIFT;
> -
> -	if (id != ISL29035_DEVICE_ID)
> -		return -ENODEV;
> -
> -	/* Clear brownout bit */
> -	return regmap_update_bits(chip->regmap, ISL29035_REG_DEVICE_ID,
> -				  ISL29035_BOUT_MASK, 0);
> -}
> -
> -enum {
> -	isl29018,
> -	isl29023,
> -	isl29035,
> -};
> -
> -static int isl29018_chip_init(struct isl29018_chip *chip)
> -{
> -	int status;
> -	struct device *dev = regmap_get_device(chip->regmap);
> -
> -	if (chip->type == isl29035) {
> -		status = isl29035_detect(chip);
> -		if (status < 0)
> -			return status;
> -	}
> -
> -	/* Code added per Intersil Application Note 1534:
> -	 *     When VDD sinks to approximately 1.8V or below, some of
> -	 * the part's registers may change their state. When VDD
> -	 * recovers to 2.25V (or greater), the part may thus be in an
> -	 * unknown mode of operation. The user can return the part to
> -	 * a known mode of operation either by (a) setting VDD = 0V for
> -	 * 1 second or more and then powering back up with a slew rate
> -	 * of 0.5V/ms or greater, or (b) via I2C disable all ALS/PROX
> -	 * conversions, clear the test registers, and then rewrite all
> -	 * registers to the desired values.
> -	 * ...
> -	 * For ISL29011, ISL29018, ISL29021, ISL29023
> -	 * 1. Write 0x00 to register 0x08 (TEST)
> -	 * 2. Write 0x00 to register 0x00 (CMD1)
> -	 * 3. Rewrite all registers to the desired values
> -	 *
> -	 * ISL29018 Data Sheet (FN6619.1, Feb 11, 2010) essentially says
> -	 * the same thing EXCEPT the data sheet asks for a 1ms delay after
> -	 * writing the CMD1 register.
> -	 */
> -	status = regmap_write(chip->regmap, ISL29018_REG_TEST, 0x0);
> -	if (status < 0) {
> -		dev_err(dev, "Failed to clear isl29018 TEST reg.(%d)\n",
> -			status);
> -		return status;
> -	}
> -
> -	/* See Intersil AN1534 comments above.
> -	 * "Operating Mode" (COMMAND1) register is reprogrammed when
> -	 * data is read from the device.
> -	 */
> -	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1, 0);
> -	if (status < 0) {
> -		dev_err(dev, "Failed to clear isl29018 CMD1 reg.(%d)\n",
> -			status);
> -		return status;
> -	}
> -
> -	usleep_range(1000, 2000);	/* per data sheet, page 10 */
> -
> -	/* Set defaults */
> -	status = isl29018_set_scale(chip, chip->scale.scale,
> -				    chip->scale.uscale);
> -	if (status < 0) {
> -		dev_err(dev, "Init of isl29018 fails\n");
> -		return status;
> -	}
> -
> -	status = isl29018_set_integration_time(chip,
> -			isl29018_int_utimes[chip->type][chip->int_time]);
> -	if (status < 0) {
> -		dev_err(dev, "Init of isl29018 fails\n");
> -		return status;
> -	}
> -
> -	return 0;
> -}
> -
> -static const struct iio_info isl29018_info = {
> -	.attrs = &isl29018_group,
> -	.driver_module = THIS_MODULE,
> -	.read_raw = isl29018_read_raw,
> -	.write_raw = isl29018_write_raw,
> -};
> -
> -static const struct iio_info isl29023_info = {
> -	.attrs = &isl29023_group,
> -	.driver_module = THIS_MODULE,
> -	.read_raw = isl29018_read_raw,
> -	.write_raw = isl29018_write_raw,
> -};
> -
> -static bool isl29018_is_volatile_reg(struct device *dev, unsigned int reg)
> -{
> -	switch (reg) {
> -	case ISL29018_REG_ADD_DATA_LSB:
> -	case ISL29018_REG_ADD_DATA_MSB:
> -	case ISL29018_REG_ADD_COMMAND1:
> -	case ISL29018_REG_TEST:
> -	case ISL29035_REG_DEVICE_ID:
> -		return true;
> -	default:
> -		return false;
> -	}
> -}
> -
> -static const struct regmap_config isl29018_regmap_config = {
> -	.reg_bits = 8,
> -	.val_bits = 8,
> -	.volatile_reg = isl29018_is_volatile_reg,
> -	.max_register = ISL29018_REG_TEST,
> -	.num_reg_defaults_raw = ISL29018_REG_TEST + 1,
> -	.cache_type = REGCACHE_RBTREE,
> -};
> -
> -static const struct regmap_config isl29035_regmap_config = {
> -	.reg_bits = 8,
> -	.val_bits = 8,
> -	.volatile_reg = isl29018_is_volatile_reg,
> -	.max_register = ISL29035_REG_DEVICE_ID,
> -	.num_reg_defaults_raw = ISL29035_REG_DEVICE_ID + 1,
> -	.cache_type = REGCACHE_RBTREE,
> -};
> -
> -struct isl29018_chip_info {
> -	const struct iio_chan_spec *channels;
> -	int num_channels;
> -	const struct iio_info *indio_info;
> -	const struct regmap_config *regmap_cfg;
> -};
> -
> -static const struct isl29018_chip_info isl29018_chip_info_tbl[] = {
> -	[isl29018] = {
> -		.channels = isl29018_channels,
> -		.num_channels = ARRAY_SIZE(isl29018_channels),
> -		.indio_info = &isl29018_info,
> -		.regmap_cfg = &isl29018_regmap_config,
> -	},
> -	[isl29023] = {
> -		.channels = isl29023_channels,
> -		.num_channels = ARRAY_SIZE(isl29023_channels),
> -		.indio_info = &isl29023_info,
> -		.regmap_cfg = &isl29018_regmap_config,
> -	},
> -	[isl29035] = {
> -		.channels = isl29023_channels,
> -		.num_channels = ARRAY_SIZE(isl29023_channels),
> -		.indio_info = &isl29023_info,
> -		.regmap_cfg = &isl29035_regmap_config,
> -	},
> -};
> -
> -static const char *isl29018_match_acpi_device(struct device *dev, int *data)
> -{
> -	const struct acpi_device_id *id;
> -
> -	id = acpi_match_device(dev->driver->acpi_match_table, dev);
> -
> -	if (!id)
> -		return NULL;
> -
> -	*data = (int)id->driver_data;
> -
> -	return dev_name(dev);
> -}
> -
> -static int isl29018_probe(struct i2c_client *client,
> -			  const struct i2c_device_id *id)
> -{
> -	struct isl29018_chip *chip;
> -	struct iio_dev *indio_dev;
> -	int err;
> -	const char *name = NULL;
> -	int dev_id = 0;
> -
> -	indio_dev = devm_iio_device_alloc(&client->dev, sizeof(*chip));
> -	if (!indio_dev)
> -		return -ENOMEM;
> -	chip = iio_priv(indio_dev);
> -
> -	i2c_set_clientdata(client, indio_dev);
> -
> -	if (id) {
> -		name = id->name;
> -		dev_id = id->driver_data;
> -	}
> -
> -	if (ACPI_HANDLE(&client->dev))
> -		name = isl29018_match_acpi_device(&client->dev, &dev_id);
> -
> -	mutex_init(&chip->lock);
> -
> -	chip->type = dev_id;
> -	chip->calibscale = 1;
> -	chip->ucalibscale = 0;
> -	chip->int_time = ISL29018_INT_TIME_16;
> -	chip->scale = isl29018_scales[chip->int_time][0];
> -	chip->suspended = false;
> -
> -	chip->regmap = devm_regmap_init_i2c(client,
> -				isl29018_chip_info_tbl[dev_id].regmap_cfg);
> -	if (IS_ERR(chip->regmap)) {
> -		err = PTR_ERR(chip->regmap);
> -		dev_err(&client->dev, "regmap initialization fails: %d\n", err);
> -		return err;
> -	}
> -
> -	err = isl29018_chip_init(chip);
> -	if (err)
> -		return err;
> -
> -	indio_dev->info = isl29018_chip_info_tbl[dev_id].indio_info;
> -	indio_dev->channels = isl29018_chip_info_tbl[dev_id].channels;
> -	indio_dev->num_channels = isl29018_chip_info_tbl[dev_id].num_channels;
> -	indio_dev->name = name;
> -	indio_dev->dev.parent = &client->dev;
> -	indio_dev->modes = INDIO_DIRECT_MODE;
> -	return devm_iio_device_register(&client->dev, indio_dev);
> -}
> -
> -#ifdef CONFIG_PM_SLEEP
> -static int isl29018_suspend(struct device *dev)
> -{
> -	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
> -
> -	mutex_lock(&chip->lock);
> -
> -	/* Since this driver uses only polling commands, we are by default in
> -	 * auto shutdown (ie, power-down) mode.
> -	 * So we do not have much to do here.
> -	 */
> -	chip->suspended = true;
> -
> -	mutex_unlock(&chip->lock);
> -	return 0;
> -}
> -
> -static int isl29018_resume(struct device *dev)
> -{
> -	struct isl29018_chip *chip = iio_priv(dev_get_drvdata(dev));
> -	int err;
> -
> -	mutex_lock(&chip->lock);
> -
> -	err = isl29018_chip_init(chip);
> -	if (!err)
> -		chip->suspended = false;
> -
> -	mutex_unlock(&chip->lock);
> -	return err;
> -}
> -
> -static SIMPLE_DEV_PM_OPS(isl29018_pm_ops, isl29018_suspend, isl29018_resume);
> -#define ISL29018_PM_OPS (&isl29018_pm_ops)
> -#else
> -#define ISL29018_PM_OPS NULL
> -#endif
> -
> -static const struct acpi_device_id isl29018_acpi_match[] = {
> -	{"ISL29018", isl29018},
> -	{"ISL29023", isl29023},
> -	{"ISL29035", isl29035},
> -	{},
> -};
> -MODULE_DEVICE_TABLE(acpi, isl29018_acpi_match);
> -
> -static const struct i2c_device_id isl29018_id[] = {
> -	{"isl29018", isl29018},
> -	{"isl29023", isl29023},
> -	{"isl29035", isl29035},
> -	{}
> -};
> -
> -MODULE_DEVICE_TABLE(i2c, isl29018_id);
> -
> -static const struct of_device_id isl29018_of_match[] = {
> -	{ .compatible = "isil,isl29018", },
> -	{ .compatible = "isil,isl29023", },
> -	{ .compatible = "isil,isl29035", },
> -	{ },
> -};
> -MODULE_DEVICE_TABLE(of, isl29018_of_match);
> -
> -static struct i2c_driver isl29018_driver = {
> -	.driver	 = {
> -			.name = "isl29018",
> -			.acpi_match_table = ACPI_PTR(isl29018_acpi_match),
> -			.pm = ISL29018_PM_OPS,
> -			.of_match_table = isl29018_of_match,
> -		    },
> -	.probe	 = isl29018_probe,
> -	.id_table = isl29018_id,
> -};
> -module_i2c_driver(isl29018_driver);
> -
> -MODULE_DESCRIPTION("ISL29018 Ambient Light Sensor driver");
> -MODULE_LICENSE("GPL");
> 

Re: [PATCH 4/4] staging: iio: isl29018: move out of staging

[Brian Masney]

On Sun, Oct 09, 2016 at 10:45:12AM +0100, Jonathan Cameron wrote:
> On 07/10/16 01:48, Brian Masney wrote:
> > Move ISL29018/ISL29023/ISL29035 driver out of staging into mainline.
> > 
> > Signed-off-by: Brian Masney <masneyb@onstation.org>
> Time for a nitpick tastic review ;)
> 
> The nature of a move out of staging patch is that we'll go over it
> with the level of fine toothed comb we apply to a new submission.
> A good part of my aim here is to ensure that once it's out it doesn't
> get a lot of churn from whitespace or comment syntax patches etc.
> 
> I want to be able to ignore it for ever more and have it continue to
> work perfectly and be beautiful code ;)
> 
> Anyhow, nothing of any significance at all in here, but it will need
> a couple of precursor patches to clean up the loose ends before we
> move it out of staging.
> 
> Thanks for doing this and sorry to bounce it back to you over such
> trivial stuff!

Thanks, Jonathan, for taking the time to go through this. I'll send a
second patch series in a day or two.

I'm hoping to have one of these light sensors (along with 2 others in
staging/iio/light/) in a week or so that I can hook it up to a
Raspberry Pi to test the drivers. I ordered the sensors off of
Digi-Key for a few dollars each. One of my friends is mounting them
onto a breakout board for me.

Is my change that renames the Kconfig variable acceptable? After I
emailed that last patch set, I noticed that the description in Kconfig
for this driver has 'ISL 29018' but the neighboring one in mainline has
'Intersil ISL29125' so I assume that should be changed as well for
consistency.

Brian

Re: [PATCH 4/4] staging: iio: isl29018: move out of staging

[Jonathan Cameron]

On 09/10/16 11:35, Brian Masney wrote:
> On Sun, Oct 09, 2016 at 10:45:12AM +0100, Jonathan Cameron wrote:
>> On 07/10/16 01:48, Brian Masney wrote:
>>> Move ISL29018/ISL29023/ISL29035 driver out of staging into mainline.
>>>
>>> Signed-off-by: Brian Masney <masneyb@onstation.org>
>> Time for a nitpick tastic review ;)
>>
>> The nature of a move out of staging patch is that we'll go over it
>> with the level of fine toothed comb we apply to a new submission.
>> A good part of my aim here is to ensure that once it's out it doesn't
>> get a lot of churn from whitespace or comment syntax patches etc.
>>
>> I want to be able to ignore it for ever more and have it continue to
>> work perfectly and be beautiful code ;)
>>
>> Anyhow, nothing of any significance at all in here, but it will need
>> a couple of precursor patches to clean up the loose ends before we
>> move it out of staging.
>>
>> Thanks for doing this and sorry to bounce it back to you over such
>> trivial stuff!
> 
> Thanks, Jonathan, for taking the time to go through this. I'll send a
> second patch series in a day or two.
> 
> I'm hoping to have one of these light sensors (along with 2 others in
> staging/iio/light/) in a week or so that I can hook it up to a
> Raspberry Pi to test the drivers. I ordered the sensors off of
> Digi-Key for a few dollars each. One of my friends is mounting them
> onto a breakout board for me.
> 
> Is my change that renames the Kconfig variable acceptable? After I
> emailed that last patch set, I noticed that the description in Kconfig
> for this driver has 'ISL 29018' but the neighboring one in mainline has
> 'Intersil ISL29125' so I assume that should be changed as well for
> consistency.
Just realised I didn't press send on my reply to that one.

Upshot is unfortunately no.  Feel free to fix the description though!

Jonathan
> 
> Brian
> 

Re: [PATCH 1/4] staging: iio: isl29018: add documentation about the infrared suppression

[Jonathan Cameron]

On 07/10/16 01:48, Brian Masney wrote:
> Add documentation from the ISL29018 Data Sheet (FN6619.4, Oct 8, 2012)
> about the infrared suppression that can be controlled
> with the proximity_on_chip_ambient_infrared_suppression sysfs attribute.
> 
> Signed-off-by: Brian Masney <masneyb@onstation.org>
> ---
>  drivers/staging/iio/light/isl29018.c | 18 ++++++++++++++++++
>  1 file changed, 18 insertions(+)
> 
> diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
> index 51226bd..52bfb1cb 100644
> --- a/drivers/staging/iio/light/isl29018.c
> +++ b/drivers/staging/iio/light/isl29018.c
> @@ -307,6 +307,24 @@ static ssize_t in_illuminance_integration_time_available_show
>  	return len;
>  }
>  
> +/*
> + * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
> + * infrared suppression:
> + *
> + *   Proximity Sensing Scheme: Bit 7. This bit programs the function
> + * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
> + * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
> + * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
> + * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
> + * proximity_less_ambient detection. The range of Scheme 1
> + * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
> + * for resolutions less than 16. While Scheme 0 has wider dynamic
> + * range, Scheme 1 proximity detection is less affected by the
> + * ambient IR noise variation.
> + *
> + * 0 Sensing IR from LED and ambient
> + * 1 Sensing IR from LED with ambient IR rejection
> + */
Hi Brian,

This is good stuff, but the home of ABI docs (where it 'has' to be as
opposed to here where it is nice to have) is
Documentation/ABI/testing/sysfs-bus-iio-* (here isl29018 until we
see if this becomes generic enough to promote to a more generic file)

Jonathan
>  static ssize_t proximity_on_chip_ambient_infrared_suppression_show
>  			(struct device *dev, struct device_attribute *attr,
>  			 char *buf)
> 

Re: [PATCH 1/4] staging: iio: isl29018: add documentation about the infrared suppression

[Jonathan Cameron]

On 09/10/16 09:43, Jonathan Cameron wrote:
> On 07/10/16 01:48, Brian Masney wrote:
>> Add documentation from the ISL29018 Data Sheet (FN6619.4, Oct 8, 2012)
>> about the infrared suppression that can be controlled
>> with the proximity_on_chip_ambient_infrared_suppression sysfs attribute.
>>
>> Signed-off-by: Brian Masney <masneyb@onstation.org>
>> ---
>>  drivers/staging/iio/light/isl29018.c | 18 ++++++++++++++++++
>>  1 file changed, 18 insertions(+)
>>
>> diff --git a/drivers/staging/iio/light/isl29018.c b/drivers/staging/iio/light/isl29018.c
>> index 51226bd..52bfb1cb 100644
>> --- a/drivers/staging/iio/light/isl29018.c
>> +++ b/drivers/staging/iio/light/isl29018.c
>> @@ -307,6 +307,24 @@ static ssize_t in_illuminance_integration_time_available_show
>>  	return len;
>>  }
>>  
>> +/*
>> + * From ISL29018 Data Sheet (FN6619.4, Oct 8, 2012) regarding the
>> + * infrared suppression:
>> + *
>> + *   Proximity Sensing Scheme: Bit 7. This bit programs the function
>> + * of the proximity detection. Logic 0 of this bit, Scheme 0, makes
>> + * full n (4, 8, 12, 16) bits (unsigned) proximity detection. The range
>> + * of Scheme 0 proximity count is from 0 to 2^n. Logic 1 of this bit,
>> + * Scheme 1, makes n-1 (3, 7, 11, 15) bits (2's complementary)
>> + * proximity_less_ambient detection. The range of Scheme 1
>> + * proximity count is from -2^(n-1) to 2^(n-1) . The sign bit is extended
>> + * for resolutions less than 16. While Scheme 0 has wider dynamic
>> + * range, Scheme 1 proximity detection is less affected by the
>> + * ambient IR noise variation.
>> + *
>> + * 0 Sensing IR from LED and ambient
>> + * 1 Sensing IR from LED with ambient IR rejection
>> + */
> Hi Brian,
> 
> This is good stuff, but the home of ABI docs (where it 'has' to be as
> opposed to here where it is nice to have) is
> Documentation/ABI/testing/sysfs-bus-iio-* (here isl29018 until we
> see if this becomes generic enough to promote to a more generic file)
> 
Forgot to say, I applied this as it is a good addition in it's own right.
Just looking for a follow up patch adding the ABI docs.

Thanks,

Jonathan
> Jonathan
>>  static ssize_t proximity_on_chip_ambient_infrared_suppression_show
>>  			(struct device *dev, struct device_attribute *attr,
>>  			 char *buf)
>>
> 
> --
> To unsubscribe from this list: send the line "unsubscribe linux-iio" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>