Commit 4123e69a authored by Brian Masney's avatar Brian Masney Committed by Jonathan Cameron

staging: iio: tsl2x7x: split out als and prox interrupt settings

The struct tsl2x7x_settings contained an interrupts_en member that was
a bitmask for which interrupts are enabled. This required having
bitmasks in several parts of the code. This patch splits this field
out into two booleans to remove most of the bitmasks in the code.

This patch also fixes a bug where if an interrupt pin was configured,
but proximity interrupts were disabled, then the proximity value could
not be polled.

This patch also removes an unnecessary second call to writing the
control register in tsl2x7x_chip_on().

Driver tested using a TSL2772 hooked up to a Raspberry Pi 2.
Signed-off-by: default avatarBrian Masney <masneyb@onstation.org>
Signed-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent bce075d0
...@@ -226,10 +226,11 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = { ...@@ -226,10 +226,11 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = {
.prox_config = 0, .prox_config = 0,
.als_gain_trim = 1000, .als_gain_trim = 1000,
.als_cal_target = 150, .als_cal_target = 150,
.als_interrupt_en = false,
.als_thresh_low = 200, .als_thresh_low = 200,
.als_thresh_high = 256, .als_thresh_high = 256,
.persistence = 255, .persistence = 255,
.interrupts_en = 0, .prox_interrupt_en = false,
.prox_thres_low = 0, .prox_thres_low = 0,
.prox_thres_high = 512, .prox_thres_high = 512,
.prox_max_samples_cal = 30, .prox_max_samples_cal = 30,
...@@ -686,37 +687,22 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev) ...@@ -686,37 +687,22 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev)
/* Power-on settling time */ /* Power-on settling time */
usleep_range(3000, 3500); usleep_range(3000, 3500);
/* reg_val = TSL2X7X_CNTL_PWR_ON | TSL2X7X_CNTL_ADC_ENBL |
* NOW enable the ADC TSL2X7X_CNTL_PROX_DET_ENBL;
* initialize the desired mode of operation if (chip->settings.als_interrupt_en)
*/ reg_val |= TSL2X7X_CNTL_ALS_INT_ENBL;
ret = tsl2x7x_write_control_reg(chip, if (chip->settings.prox_interrupt_en)
TSL2X7X_CNTL_PWR_ON | reg_val |= TSL2X7X_CNTL_PROX_INT_ENBL;
TSL2X7X_CNTL_ADC_ENBL |
TSL2X7X_CNTL_PROX_DET_ENBL);
if (ret < 0)
return ret;
chip->tsl2x7x_chip_status = TSL2X7X_CHIP_WORKING;
if (chip->settings.interrupts_en != 0) {
dev_info(&chip->client->dev, "Setting Up Interrupt(s)\n");
reg_val = TSL2X7X_CNTL_PWR_ON | TSL2X7X_CNTL_ADC_ENBL;
if (chip->settings.interrupts_en == 0x20 ||
chip->settings.interrupts_en == 0x30)
reg_val |= TSL2X7X_CNTL_PROX_DET_ENBL;
reg_val |= chip->settings.interrupts_en;
ret = tsl2x7x_write_control_reg(chip, reg_val); ret = tsl2x7x_write_control_reg(chip, reg_val);
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = tsl2x7x_clear_interrupts(chip, ret = tsl2x7x_clear_interrupts(chip, TSL2X7X_CMD_PROXALS_INT_CLR);
TSL2X7X_CMD_PROXALS_INT_CLR);
if (ret < 0) if (ret < 0)
return ret; return ret;
}
chip->tsl2x7x_chip_status = TSL2X7X_CHIP_WORKING;
return ret; return ret;
} }
...@@ -978,14 +964,11 @@ static int tsl2x7x_read_interrupt_config(struct iio_dev *indio_dev, ...@@ -978,14 +964,11 @@ static int tsl2x7x_read_interrupt_config(struct iio_dev *indio_dev,
enum iio_event_direction dir) enum iio_event_direction dir)
{ {
struct tsl2X7X_chip *chip = iio_priv(indio_dev); struct tsl2X7X_chip *chip = iio_priv(indio_dev);
int ret;
if (chan->type == IIO_INTENSITY) if (chan->type == IIO_INTENSITY)
ret = !!(chip->settings.interrupts_en & 0x10); return chip->settings.als_interrupt_en;
else else
ret = !!(chip->settings.interrupts_en & 0x20); return chip->settings.prox_interrupt_en;
return ret;
} }
static int tsl2x7x_write_interrupt_config(struct iio_dev *indio_dev, static int tsl2x7x_write_interrupt_config(struct iio_dev *indio_dev,
...@@ -997,17 +980,10 @@ static int tsl2x7x_write_interrupt_config(struct iio_dev *indio_dev, ...@@ -997,17 +980,10 @@ static int tsl2x7x_write_interrupt_config(struct iio_dev *indio_dev,
struct tsl2X7X_chip *chip = iio_priv(indio_dev); struct tsl2X7X_chip *chip = iio_priv(indio_dev);
int ret; int ret;
if (chan->type == IIO_INTENSITY) { if (chan->type == IIO_INTENSITY)
if (val) chip->settings.als_interrupt_en = val ? true : false;
chip->settings.interrupts_en |= 0x10;
else
chip->settings.interrupts_en &= 0x20;
} else {
if (val)
chip->settings.interrupts_en |= 0x20;
else else
chip->settings.interrupts_en &= 0x10; chip->settings.prox_interrupt_en = val ? true : false;
}
ret = tsl2x7x_invoke_change(indio_dev); ret = tsl2x7x_invoke_change(indio_dev);
if (ret < 0) if (ret < 0)
......
...@@ -50,12 +50,12 @@ struct tsl2x7x_lux { ...@@ -50,12 +50,12 @@ struct tsl2x7x_lux {
* @prox_config: Prox configuration filters. * @prox_config: Prox configuration filters.
* @als_cal_target: Known external ALS reading for * @als_cal_target: Known external ALS reading for
* calibration. * calibration.
* @interrupts_en: Enable/Disable - 0x00 = none, 0x10 = als,
* 0x20 = prx, 0x30 = bth
* @persistence: H/W Filters, Number of 'out of limits' * @persistence: H/W Filters, Number of 'out of limits'
* ADC readings PRX/ALS. * ADC readings PRX/ALS.
* @als_interrupt_en: Enable/Disable ALS interrupts
* @als_thresh_low: CH0 'low' count to trigger interrupt. * @als_thresh_low: CH0 'low' count to trigger interrupt.
* @als_thresh_high: CH0 'high' count to trigger interrupt. * @als_thresh_high: CH0 'high' count to trigger interrupt.
* @prox_interrupt_en: Enable/Disable proximity interrupts
* @prox_thres_low: Low threshold proximity detection. * @prox_thres_low: Low threshold proximity detection.
* @prox_thres_high: High threshold proximity detection * @prox_thres_high: High threshold proximity detection
* @prox_pulse_count: Number if proximity emitter pulses * @prox_pulse_count: Number if proximity emitter pulses
...@@ -70,10 +70,11 @@ struct tsl2x7x_settings { ...@@ -70,10 +70,11 @@ struct tsl2x7x_settings {
int prox_gain; int prox_gain;
int prox_config; int prox_config;
int als_cal_target; int als_cal_target;
u8 interrupts_en;
u8 persistence; u8 persistence;
bool als_interrupt_en;
int als_thresh_low; int als_thresh_low;
int als_thresh_high; int als_thresh_high;
bool prox_interrupt_en;
int prox_thres_low; int prox_thres_low;
int prox_thres_high; int prox_thres_high;
int prox_pulse_count; int prox_pulse_count;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment