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

Commit 13e6d634 authored by Peter Meerwald-Stadler's avatar Peter Meerwald-Stadler Committed by Jonathan Cameron
Browse files

staging: iio: isl29018: Prefix #defines 



Signed-off-by: default avatarPeter Meerwald-Stadler <pmeerw@pmeerw.net>
Signed-off-by: default avatarJonathan Cameron <jic23@kernel.org>
parent ff34ed6d

drivers/staging/iio/light/isl29018.c

+32 −29
Original line number Diff line number Diff line
@@ -32,25 +32,25 @@ 
#include <linux/iio/sysfs.h>

#include <linux/acpi.h>



#define CONVERSION_TIME_MS		100

#define ISL29018_CONV_TIME_MS		100



#define ISL29018_REG_ADD_COMMAND1	0x00

#define COMMMAND1_OPMODE_SHIFT		5

#define COMMMAND1_OPMODE_MASK		(7 << COMMMAND1_OPMODE_SHIFT)

#define COMMMAND1_OPMODE_POWER_DOWN	0

#define COMMMAND1_OPMODE_ALS_ONCE	1

#define COMMMAND1_OPMODE_IR_ONCE	2

#define COMMMAND1_OPMODE_PROX_ONCE	3

#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_COMMANDII	0x01

#define COMMANDII_RESOLUTION_SHIFT	2

#define COMMANDII_RESOLUTION_MASK	(0x3 << COMMANDII_RESOLUTION_SHIFT)

#define ISL29018_REG_ADD_COMMAND2	0x01

#define ISL29018_CMD2_RESOLUTION_SHIFT	2

#define ISL29018_CMD2_RESOLUTION_MASK	(0x3 << ISL29018_CMD2_RESOLUTION_SHIFT)



#define COMMANDII_RANGE_SHIFT		0

#define COMMANDII_RANGE_MASK		(0x3 << COMMANDII_RANGE_SHIFT)

#define ISL29018_CMD2_RANGE_SHIFT	0

#define ISL29018_CMD2_RANGE_MASK	(0x3 << ISL29018_CMD2_RANGE_SHIFT)



#define COMMANDII_SCHEME_SHIFT		7

#define COMMANDII_SCHEME_MASK		(0x1 << COMMANDII_SCHEME_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
@@ -127,9 +127,9 @@ static int isl29018_set_integration_time(struct isl29018_chip *chip, 
	if (i >= ARRAY_SIZE(isl29018_int_utimes[chip->type]))

		return -EINVAL;



	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMANDII,

				 COMMANDII_RESOLUTION_MASK,

				 i << COMMANDII_RESOLUTION_SHIFT);

	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,

				 ISL29018_CMD2_RESOLUTION_MASK,

				 i << ISL29018_CMD2_RESOLUTION_SHIFT);

	if (ret < 0)

		return ret;
@@ -163,9 +163,9 @@ static int isl29018_set_scale(struct isl29018_chip *chip, int scale, int uscale) 
	if (i >= ARRAY_SIZE(isl29018_scales[chip->int_time]))

		return -EINVAL;



	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMANDII,

				 COMMANDII_RANGE_MASK,

				 i << COMMANDII_RANGE_SHIFT);

	ret = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMAND2,

				 ISL29018_CMD2_RANGE_MASK,

				 i << ISL29018_CMD2_RANGE_SHIFT);

	if (ret < 0)

		return ret;
@@ -183,13 +183,13 @@ static int isl29018_read_sensor_input(struct isl29018_chip *chip, int mode) 


	/* Set mode */

	status = regmap_write(chip->regmap, ISL29018_REG_ADD_COMMAND1,

			      mode << COMMMAND1_OPMODE_SHIFT);

			      mode << ISL29018_CMD1_OPMODE_SHIFT);

	if (status) {

		dev_err(dev,

			"Error in setting operating mode err %d\n", status);

		return status;

	}

	msleep(CONVERSION_TIME_MS);

	msleep(ISL29018_CONV_TIME_MS);

	status = regmap_read(chip->regmap, ISL29018_REG_ADD_DATA_LSB, &lsb);

	if (status < 0) {

		dev_err(dev,
@@ -213,7 +213,8 @@ 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, COMMMAND1_OPMODE_ALS_ONCE);

	lux_data = isl29018_read_sensor_input(chip,

					      ISL29018_CMD1_OPMODE_ALS_ONCE);



	if (lux_data < 0)

		return lux_data;
@@ -230,7 +231,8 @@ static int isl29018_read_ir(struct isl29018_chip *chip, int *ir) 
{

	int ir_data;



	ir_data = isl29018_read_sensor_input(chip, COMMMAND1_OPMODE_IR_ONCE);

	ir_data = isl29018_read_sensor_input(chip,

					     ISL29018_CMD1_OPMODE_IR_ONCE);



	if (ir_data < 0)

		return ir_data;
@@ -249,16 +251,16 @@ static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme, 
	struct device *dev = regmap_get_device(chip->regmap);



	/* Do proximity sensing with required scheme */

	status = regmap_update_bits(chip->regmap, ISL29018_REG_ADD_COMMANDII,

				    COMMANDII_SCHEME_MASK,

				    scheme << COMMANDII_SCHEME_SHIFT);

	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,

					       COMMMAND1_OPMODE_PROX_ONCE);

					       ISL29018_CMD1_OPMODE_PROX_ONCE);

	if (prox_data < 0)

		return prox_data;
@@ -267,7 +269,8 @@ static int isl29018_read_proximity_ir(struct isl29018_chip *chip, int scheme, 
		return 0;

	}



	ir_data = isl29018_read_sensor_input(chip, COMMMAND1_OPMODE_IR_ONCE);

	ir_data = isl29018_read_sensor_input(chip,

					     ISL29018_CMD1_OPMODE_IR_ONCE);



	if (ir_data < 0)

		return ir_data;