summaryrefslogtreecommitdiffstats
path: root/drivers/staging/iio
diff options
context:
space:
mode:
authorBrian Masney <masneyb@onstation.org>2016-11-03 08:56:15 -0400
committerJonathan Cameron <jic23@kernel.org>2016-11-06 11:51:17 +0000
commitbabe444798ebfe02f2e870322927c7018957c7f3 (patch)
tree5f0c36b221c3399558bd851c75f36a604e967179 /drivers/staging/iio
parent4a0f36144c2504313f62cad31564e405ebbbb47b (diff)
downloadblackbird-op-linux-babe444798ebfe02f2e870322927c7018957c7f3.tar.gz
blackbird-op-linux-babe444798ebfe02f2e870322927c7018957c7f3.zip
staging: iio: tsl2583: remove redundant power off sequence in taos_chip_on()
taos_chip_on() explicitly turns the sensor power on and then writes the 8 registers that are stored in taos_config. The first register in taos_config is the CONTROL register and the configuration is set to turn the power off. The existing state sequence in taos_chip_on() is: - Turn device power on - Turn device power off (via taos_config) - Configure other 7 registers (via taos_config) - Turn device power on, enable ADC This patch changes the code so that the device is not powered off via taos_config. Verified that the driver still functions correctly using a TSL2581 hooked up to a Raspberry Pi 2. Signed-off-by: Brian Masney <masneyb@onstation.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/staging/iio')
-rw-r--r--drivers/staging/iio/light/tsl2583.c13
1 files changed, 2 insertions, 11 deletions
diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
index 709f44662a9f..7fb09c641822 100644
--- a/drivers/staging/iio/light/tsl2583.c
+++ b/drivers/staging/iio/light/tsl2583.c
@@ -410,17 +410,8 @@ static int taos_chip_on(struct iio_dev *indio_dev)
chip->als_saturation = als_count * 922; /* 90% of full scale */
chip->als_time_scale = (als_time + 25) / 50;
- /*
- * TSL258x Specific power-on / adc enable sequence
- * Power on the device 1st.
- */
- utmp = TSL258X_CNTL_PWR_ON;
- ret = i2c_smbus_write_byte_data(chip->client,
- TSL258X_CMD_REG | TSL258X_CNTRL, utmp);
- if (ret < 0) {
- dev_err(&chip->client->dev, "taos_chip_on failed on CNTRL reg.\n");
- return ret;
- }
+ /* Power on the device; ADC off. */
+ chip->taos_config[TSL258X_CNTRL] = TSL258X_CNTL_PWR_ON;
/*
* Use the following shadow copy for our delay before enabling ADC.
OpenPOWER on IntegriCloud