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

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

staging: iio: tsl2x7x: rename prox_config to als_prox_config 



The configuration register on the device is represented with the
prox_config member on the tsl2x7x_settings structure. According to the
TSL2772 data sheet, this register can hold: 1) the proximity drive
level, 2) ALS/Proximity long wait, and 3) the ALS gain level. This
patch renames prox_config to als_prox_config since ALS settings can
be stored here as well.

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

drivers/staging/iio/light/tsl2x7x.c

+4 −3
Original line number Original line Diff line number Diff line
@@ -64,7 +64,7 @@ 
#define TSL2X7X_PRX_MAXTHRESHLO		0X0A

#define TSL2X7X_PRX_MAXTHRESHLO		0X0A

#define TSL2X7X_PRX_MAXTHRESHHI		0X0B

#define TSL2X7X_PRX_MAXTHRESHHI		0X0B

#define TSL2X7X_PERSISTENCE		0x0C

#define TSL2X7X_PERSISTENCE		0x0C

#define TSL2X7X_PRX_CONFIG		0x0D

#define TSL2X7X_ALS_PRX_CONFIG		0x0D

#define TSL2X7X_PRX_COUNT		0x0E

#define TSL2X7X_PRX_COUNT		0x0E

#define TSL2X7X_GAIN			0x0F

#define TSL2X7X_GAIN			0x0F

#define TSL2X7X_NOTUSED			0x10

#define TSL2X7X_NOTUSED			0x10
@@ -215,7 +215,7 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = { 
	.prox_time = 255, /* 2.73 ms */

	.prox_time = 255, /* 2.73 ms */

	.prox_gain = 0,

	.prox_gain = 0,

	.wait_time = 255,

	.wait_time = 255,

	.prox_config = 0,

	.als_prox_config = 0,

	.als_gain_trim = 1000,

	.als_gain_trim = 1000,

	.als_cal_target = 150,

	.als_cal_target = 150,

	.als_persistence = 1,

	.als_persistence = 1,
@@ -602,7 +602,8 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev) 
	/* Non calculated parameters */

	/* Non calculated parameters */

	chip->tsl2x7x_config[TSL2X7X_PRX_TIME] = chip->settings.prox_time;

	chip->tsl2x7x_config[TSL2X7X_PRX_TIME] = chip->settings.prox_time;

	chip->tsl2x7x_config[TSL2X7X_WAIT_TIME] = chip->settings.wait_time;

	chip->tsl2x7x_config[TSL2X7X_WAIT_TIME] = chip->settings.wait_time;

	chip->tsl2x7x_config[TSL2X7X_PRX_CONFIG] = chip->settings.prox_config;

	chip->tsl2x7x_config[TSL2X7X_ALS_PRX_CONFIG] =

		chip->settings.als_prox_config;





	chip->tsl2x7x_config[TSL2X7X_ALS_MINTHRESHLO] =

	chip->tsl2x7x_config[TSL2X7X_ALS_MINTHRESHLO] =

		(chip->settings.als_thresh_low) & 0xFF;

		(chip->settings.als_thresh_low) & 0xFF;

drivers/staging/iio/light/tsl2x7x.h

+3 −2
Original line number Original line Diff line number Diff line
@@ -60,7 +60,8 @@ struct tsl2x7x_lux { 
 *                          increments. Total integration time is

 *                          increments. Total integration time is

 *                          (256 - prx_time) * 2.73.

 *                          (256 - prx_time) * 2.73.

 *  @prox_gain:             Index into the tsl2x7x_prx_gain array.

 *  @prox_gain:             Index into the tsl2x7x_prx_gain array.

 *  @prox_config:           Prox configuration filters.

 *  @als_prox_config:       The value of the ALS / Proximity configuration

 *                          register.

 *  @als_cal_target:        Known external ALS reading for calibration.

 *  @als_cal_target:        Known external ALS reading for calibration.

 *  @als_persistence:       H/W Filters, Number of 'out of limits' ALS readings.

 *  @als_persistence:       H/W Filters, Number of 'out of limits' ALS readings.

 *  @als_interrupt_en:      Enable/Disable ALS interrupts

 *  @als_interrupt_en:      Enable/Disable ALS interrupts
@@ -85,7 +86,7 @@ struct tsl2x7x_settings { 
	int wait_time;

	int wait_time;

	int prox_time;

	int prox_time;

	int prox_gain;

	int prox_gain;

	int prox_config;

	int als_prox_config;

	int als_cal_target;

	int als_cal_target;

	u8 als_persistence;

	u8 als_persistence;

	bool als_interrupt_en;

	bool als_interrupt_en;