From: Jonathan Cameron <jic23@kernel.org>
To: Brian Masney <masneyb@onstation.org>, linux-iio@vger.kernel.org
Cc: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org,
lars@metafoo.de, pmeerw@pmeerw.net, knaack.h@gmx.de,
linux-kernel@vger.kernel.org, Jon.Brenner@ams.com
Subject: Re: [PATCH v3 02/28] staging: iio: tsl2583: fix issue with changes to calibscale and int_time not being set on the chip
Date: Sat, 12 Nov 2016 16:23:03 +0000 [thread overview]
Message-ID: <4c6af7ae-5d94-0cf2-d065-d912024cf890@kernel.org> (raw)
In-Reply-To: <1478769964-7065-3-git-send-email-masneyb@onstation.org>
On 10/11/16 09:25, Brian Masney wrote:
> When updating the in_illuminance_calibscale and
> in_illuminance_integration_time sysfs attributes, these values were not
> actually written to the chip. The chip would continue to use the old
> parameters. Extracted out tsl2583_set_als_gain() and
> tsl2583_set_als_time() functions that are now called when these sysfs
> attributes are updated. The chip initialization also calls these these
> new functions.
>
> Signed-off-by: Brian Masney <masneyb@onstation.org>
Applied to the togreg branch of iio.git and pushed out as testing
for the autobuilders to play with it.
Thanks,
Jonathan
> ---
> drivers/staging/iio/light/tsl2583.c | 85 +++++++++++++++++++++++--------------
> 1 file changed, 52 insertions(+), 33 deletions(-)
>
> diff --git a/drivers/staging/iio/light/tsl2583.c b/drivers/staging/iio/light/tsl2583.c
> index c196a42..1a7be12 100644
> --- a/drivers/staging/iio/light/tsl2583.c
> +++ b/drivers/staging/iio/light/tsl2583.c
> @@ -352,6 +352,51 @@ static int taos_als_calibrate(struct iio_dev *indio_dev)
> return (int)gain_trim_val;
> }
>
> +static int tsl2583_set_als_time(struct tsl2583_chip *chip)
> +{
> + int als_count, als_time, ret;
> + u8 val;
> +
> + /* determine als integration register */
> + als_count = (chip->taos_settings.als_time * 100 + 135) / 270;
> + if (!als_count)
> + als_count = 1; /* ensure at least one cycle */
> +
> + /* convert back to time (encompasses overrides) */
> + als_time = (als_count * 27 + 5) / 10;
> +
> + val = 256 - als_count;
> + ret = i2c_smbus_write_byte_data(chip->client,
> + TSL258X_CMD_REG | TSL258X_ALS_TIME,
> + val);
> + if (ret < 0) {
> + dev_err(&chip->client->dev, "%s failed to set the als time to %d\n",
> + __func__, val);
> + return ret;
> + }
> +
> + /* set chip struct re scaling and saturation */
> + chip->als_saturation = als_count * 922; /* 90% of full scale */
> + chip->als_time_scale = (als_time + 25) / 50;
> +
> + return ret;
> +}
> +
> +static int tsl2583_set_als_gain(struct tsl2583_chip *chip)
> +{
> + int ret;
> +
> + /* Set the gain based on taos_settings struct */
> + ret = i2c_smbus_write_byte_data(chip->client,
> + TSL258X_CMD_REG | TSL258X_GAIN,
> + chip->taos_settings.als_gain);
> + if (ret < 0)
> + dev_err(&chip->client->dev, "%s failed to set the gain to %d\n",
> + __func__, chip->taos_settings.als_gain);
> +
> + return ret;
> +}
> +
> static int tsl2583_set_power_state(struct tsl2583_chip *chip, u8 state)
> {
> int ret;
> @@ -371,10 +416,8 @@ static int tsl2583_set_power_state(struct tsl2583_chip *chip, u8 state)
> */
> static int tsl2583_chip_init_and_power_on(struct iio_dev *indio_dev)
> {
> - int ret, val;
> - int als_count;
> - int als_time;
> struct tsl2583_chip *chip = iio_priv(indio_dev);
> + int ret;
>
> /* and make sure we're not already on */
> if (chip->taos_chip_status == TSL258X_CHIP_WORKING) {
> @@ -397,37 +440,13 @@ static int tsl2583_chip_init_and_power_on(struct iio_dev *indio_dev)
> return ret;
> }
>
> - /* determine als integration register */
> - als_count = (chip->taos_settings.als_time * 100 + 135) / 270;
> - if (!als_count)
> - als_count = 1; /* ensure at least one cycle */
> -
> - /* convert back to time (encompasses overrides) */
> - als_time = (als_count * 27 + 5) / 10;
> -
> - val = 256 - als_count;
> - ret = i2c_smbus_write_byte_data(chip->client,
> - TSL258X_CMD_REG | TSL258X_ALS_TIME,
> - val);
> - if (ret < 0) {
> - dev_err(&chip->client->dev, "%s failed to set the als time to %d\n",
> - __func__, val);
> + ret = tsl2583_set_als_time(chip);
> + if (ret < 0)
> return ret;
> - }
>
> - /* Set the gain based on taos_settings struct */
> - ret = i2c_smbus_write_byte_data(chip->client,
> - TSL258X_CMD_REG | TSL258X_GAIN,
> - chip->taos_settings.als_gain);
> - if (ret < 0) {
> - dev_err(&chip->client->dev, "%s failed to set the gain to %d\n",
> - __func__, chip->taos_settings.als_gain);
> + ret = tsl2583_set_als_gain(chip);
> + if (ret < 0)
> return ret;
> - }
> -
> - /* set chip struct re scaling and saturation */
> - chip->als_saturation = als_count * 922; /* 90% of full scale */
> - chip->als_time_scale = (als_time + 25) / 50;
>
> usleep_range(3000, 3500);
>
> @@ -707,7 +726,7 @@ static int tsl2583_write_raw(struct iio_dev *indio_dev,
> for (i = 0; i < ARRAY_SIZE(gainadj); i++) {
> if (gainadj[i].mean == val) {
> chip->taos_settings.als_gain = i;
> - ret = 0;
> + ret = tsl2583_set_als_gain(chip);
> break;
> }
> }
> @@ -717,7 +736,7 @@ static int tsl2583_write_raw(struct iio_dev *indio_dev,
> if (chan->type == IIO_LIGHT && !val && val2 >= 50 &&
> val2 <= 650 && !(val2 % 50)) {
> chip->taos_settings.als_time = val2;
> - ret = 0;
> + ret = tsl2583_set_als_time(chip);
> }
> break;
> default:
>
next prev parent reply other threads:[~2016-11-12 16:23 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-11-10 9:25 [PATCH v3 00/28] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-10 9:25 ` [PATCH v3 01/28] staging: iio: tsl2583: split out functionality of taos_chip_on() Brian Masney
2016-11-12 16:17 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 02/28] staging: iio: tsl2583: fix issue with changes to calibscale and int_time not being set on the chip Brian Masney
2016-11-12 16:23 ` Jonathan Cameron [this message]
2016-11-10 9:25 ` [PATCH v3 03/28] staging: iio: tsl2583: check if chip is suspended in in_illuminance_calibrate_store Brian Masney
2016-11-12 16:24 ` Jonathan Cameron
2016-11-12 16:27 ` Jonathan Cameron
2016-11-12 16:37 ` Brian Masney
2016-11-10 9:25 ` [PATCH v3 04/28] staging: iio: tsl2583: remove unnecessary chip status check in taos_get_lux Brian Masney
2016-11-12 16:28 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 05/28] staging: iio: tsl2583: remove unnecessary chip status checks in suspend/resume Brian Masney
2016-11-12 16:31 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 06/28] staging: iio: tsl2583: change current chip state from a tristate to a bool Brian Masney
2016-11-10 9:25 ` [PATCH v3 07/28] staging: iio: tsl2583: remove redundant write to the control register in taos_probe() Brian Masney
2016-11-10 9:25 ` [PATCH v3 08/28] staging: iio: tsl2583: remove the FSF's mailing address Brian Masney
2016-11-10 9:25 ` [PATCH v3 09/28] staging: iio: tsl2583: cleaned up logging Brian Masney
2016-11-10 9:25 ` [PATCH v3 10/28] staging: iio: tsl2583: unify function and variable prefix to tsl2583_ Brian Masney
2016-11-10 9:25 ` [PATCH v3 11/28] staging: iio: tsl2583: fix alignment of #define values Brian Masney
2016-11-10 9:25 ` [PATCH v3 12/28] staging: iio: tsl2583: fix comparison between signed and unsigned integers Brian Masney
2016-11-10 9:25 ` [PATCH v3 13/28] staging: iio: tsl2583: change newlines to improve readability Brian Masney
2016-11-10 9:25 ` [PATCH v3 14/28] staging: iio: tsl2583: combine sysfs documentation Brian Masney
2016-11-10 9:25 ` [PATCH v3 15/28] staging: iio: tsl2583: fix multiline comment syntax Brian Masney
2016-11-10 9:25 ` [PATCH v3 16/28] staging: iio: tsl2583: updated code comment to match what the code does Brian Masney
2016-11-12 16:36 ` Jonathan Cameron
2016-11-12 16:59 ` Brian Masney
2016-11-12 17:10 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 17/28] staging: iio: tsl2583: moved code block inside else statement Brian Masney
2016-11-10 9:25 ` [PATCH v3 18/28] staging: iio: tsl2583: change tsl2583_als_calibrate() to return 0 on success Brian Masney
2016-11-10 9:25 ` [PATCH v3 19/28] staging: iio: tsl2583: remove unnecessary parentheses Brian Masney
2016-11-10 9:25 ` [PATCH v3 20/28] staging: iio: tsl2583: don't assume an unsigned int is 32 bits Brian Masney
2016-11-12 16:38 ` Jonathan Cameron
2016-12-05 20:55 ` Dan Carpenter
2016-11-10 9:25 ` [PATCH v3 21/28] staging: iio: tsl2583: move from a global to a per device lux table Brian Masney
2016-11-12 16:44 ` Jonathan Cameron
2016-11-10 9:25 ` [PATCH v3 22/28] staging: iio: tsl2583: add tsl2583 to list of supported devices in the header Brian Masney
2016-11-10 9:25 ` [PATCH v3 23/28] staging: iio: tsl2583: clarified comment about clearing interrupts Brian Masney
2016-11-10 9:26 ` [PATCH v3 24/28] staging: iio: tsl2583: remove comment for tsl2583_probe() Brian Masney
2016-11-10 9:26 ` [PATCH v3 25/28] staging: iio: tsl2583: remove unnecessary memset call Brian Masney
2016-11-10 9:26 ` [PATCH v3 26/28] staging: iio: tsl2583: remove unnecessary variable initialization Brian Masney
2016-11-10 9:26 ` [PATCH v3 27/28] staging: iio: tsl2583: add copyright and MODULE_AUTHOR Brian Masney
2016-11-10 9:26 ` [PATCH v3 28/28] staging: iio: tsl2583: move out of staging Brian Masney
2016-11-12 16:47 ` Jonathan Cameron
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4c6af7ae-5d94-0cf2-d065-d912024cf890@kernel.org \
--to=jic23@kernel.org \
--cc=Jon.Brenner@ams.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=knaack.h@gmx.de \
--cc=lars@metafoo.de \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=masneyb@onstation.org \
--cc=pmeerw@pmeerw.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).