From: Brian Masney <masneyb@onstation.org> To: jic23@kernel.org, linux-iio@vger.kernel.org Cc: devel@driverdev.osuosl.org, lars@metafoo.de, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org, Jon.Brenner@ams.com, pmeerw@pmeerw.net, knaack.h@gmx.de Subject: [PATCH 13/13] staging: iio: tsl2x7x: rename prox_config to als_prox_config Date: Fri, 20 Apr 2018 20:41:53 -0400 [thread overview] Message-ID: <20180421004153.19073-14-masneyb@onstation.org> (raw) In-Reply-To: <20180421004153.19073-1-masneyb@onstation.org> 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: Brian Masney <masneyb@onstation.org> --- drivers/staging/iio/light/tsl2x7x.c | 7 ++++--- drivers/staging/iio/light/tsl2x7x.h | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index 05c0f3d5fac0..708b2c6bdf4b 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -56,7 +56,7 @@ #define TSL2X7X_PRX_MAXTHRESHLO 0X0A #define TSL2X7X_PRX_MAXTHRESHHI 0X0B #define TSL2X7X_PERSISTENCE 0x0C -#define TSL2X7X_PRX_CONFIG 0x0D +#define TSL2X7X_ALS_PRX_CONFIG 0x0D #define TSL2X7X_PRX_COUNT 0x0E #define TSL2X7X_GAIN 0x0F #define TSL2X7X_NOTUSED 0x10 @@ -207,7 +207,7 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = { .prox_time = 255, /* 2.73 ms */ .prox_gain = 0, .wait_time = 255, - .prox_config = 0, + .als_prox_config = 0, .als_gain_trim = 1000, .als_cal_target = 150, .als_persistence = 1, @@ -594,7 +594,8 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev) /* Non calculated parameters */ chip->tsl2x7x_config[TSL2X7X_PRX_TIME] = chip->settings.prox_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->settings.als_thresh_low) & 0xFF; diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h index 85d8fe7a94c8..6e30e71a2127 100644 --- a/drivers/staging/iio/light/tsl2x7x.h +++ b/drivers/staging/iio/light/tsl2x7x.h @@ -48,7 +48,8 @@ struct tsl2x7x_lux { * increments. Total integration time is * (256 - prx_time) * 2.73. * @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_persistence: H/W Filters, Number of 'out of limits' ALS readings. * @als_interrupt_en: Enable/Disable ALS interrupts @@ -73,7 +74,7 @@ struct tsl2x7x_settings { int wait_time; int prox_time; int prox_gain; - int prox_config; + int als_prox_config; int als_cal_target; u8 als_persistence; bool als_interrupt_en; -- 2.14.3 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
WARNING: multiple messages have this Message-ID (diff)
From: Brian Masney <masneyb@onstation.org> To: jic23@kernel.org, linux-iio@vger.kernel.org Cc: gregkh@linuxfoundation.org, devel@driverdev.osuosl.org, knaack.h@gmx.de, lars@metafoo.de, pmeerw@pmeerw.net, linux-kernel@vger.kernel.org, Jon.Brenner@ams.com Subject: [PATCH 13/13] staging: iio: tsl2x7x: rename prox_config to als_prox_config Date: Fri, 20 Apr 2018 20:41:53 -0400 [thread overview] Message-ID: <20180421004153.19073-14-masneyb@onstation.org> (raw) In-Reply-To: <20180421004153.19073-1-masneyb@onstation.org> 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: Brian Masney <masneyb@onstation.org> --- drivers/staging/iio/light/tsl2x7x.c | 7 ++++--- drivers/staging/iio/light/tsl2x7x.h | 5 +++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/drivers/staging/iio/light/tsl2x7x.c b/drivers/staging/iio/light/tsl2x7x.c index 05c0f3d5fac0..708b2c6bdf4b 100644 --- a/drivers/staging/iio/light/tsl2x7x.c +++ b/drivers/staging/iio/light/tsl2x7x.c @@ -56,7 +56,7 @@ #define TSL2X7X_PRX_MAXTHRESHLO 0X0A #define TSL2X7X_PRX_MAXTHRESHHI 0X0B #define TSL2X7X_PERSISTENCE 0x0C -#define TSL2X7X_PRX_CONFIG 0x0D +#define TSL2X7X_ALS_PRX_CONFIG 0x0D #define TSL2X7X_PRX_COUNT 0x0E #define TSL2X7X_GAIN 0x0F #define TSL2X7X_NOTUSED 0x10 @@ -207,7 +207,7 @@ static const struct tsl2x7x_settings tsl2x7x_default_settings = { .prox_time = 255, /* 2.73 ms */ .prox_gain = 0, .wait_time = 255, - .prox_config = 0, + .als_prox_config = 0, .als_gain_trim = 1000, .als_cal_target = 150, .als_persistence = 1, @@ -594,7 +594,8 @@ static int tsl2x7x_chip_on(struct iio_dev *indio_dev) /* Non calculated parameters */ chip->tsl2x7x_config[TSL2X7X_PRX_TIME] = chip->settings.prox_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->settings.als_thresh_low) & 0xFF; diff --git a/drivers/staging/iio/light/tsl2x7x.h b/drivers/staging/iio/light/tsl2x7x.h index 85d8fe7a94c8..6e30e71a2127 100644 --- a/drivers/staging/iio/light/tsl2x7x.h +++ b/drivers/staging/iio/light/tsl2x7x.h @@ -48,7 +48,8 @@ struct tsl2x7x_lux { * increments. Total integration time is * (256 - prx_time) * 2.73. * @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_persistence: H/W Filters, Number of 'out of limits' ALS readings. * @als_interrupt_en: Enable/Disable ALS interrupts @@ -73,7 +74,7 @@ struct tsl2x7x_settings { int wait_time; int prox_time; int prox_gain; - int prox_config; + int als_prox_config; int als_cal_target; u8 als_persistence; bool als_interrupt_en; -- 2.14.3
next prev parent reply other threads:[~2018-04-21 0:41 UTC|newest] Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-21 0:41 [PATCH 00/13] iio: tsl2x7x: staging cleanups Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 0:41 ` [PATCH 01/13] staging: iio: tsl2x7x: move integration_time* attributes to IIO_INTENSITY channel Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:13 ` Jonathan Cameron 2018-04-21 16:13 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 02/13] staging: iio: tsl2x7x: use GPL-2.0+ SPDX license identifier Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:16 ` Jonathan Cameron 2018-04-21 16:16 ` Jonathan Cameron 2018-04-21 17:04 ` Brian Masney 2018-04-21 17:04 ` Brian Masney 2018-04-21 0:41 ` [PATCH 03/13] staging: iio: tsl2x7x: don't return error in IRQ handler Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:18 ` Jonathan Cameron 2018-04-21 16:18 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 04/13] staging: iio: tsl2x7x: simplify tsl2x7x_clear_interrupts function Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:20 ` Jonathan Cameron 2018-04-21 16:20 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 05/13] staging: iio: tsl2x7x: remove unnecessary chip status checks in suspend/resume Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:23 ` Jonathan Cameron 2018-04-21 16:23 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 06/13] staging: iio: tsl2x7x: simplify tsl2x7x_write_interrupt_config return Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:25 ` Jonathan Cameron 2018-04-21 16:25 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 07/13] staging: iio: tsl2x7x: simplify device id verification Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:26 ` Jonathan Cameron 2018-04-21 16:26 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 08/13] staging: iio: tsl2x7x: add range checking to three sysfs attributes Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:31 ` Jonathan Cameron 2018-04-21 16:31 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 09/13] staging: iio: tsl2x7x: move power and diode settings into header file Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:33 ` Jonathan Cameron 2018-04-21 16:33 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 10/13] staging: iio: tsl2x7x: rename prx to prox for consistency Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:33 ` Jonathan Cameron 2018-04-21 16:33 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 11/13] staging: iio: tsl2x7x: use device defaults for als_time, prox_time and wait_time Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:39 ` Jonathan Cameron 2018-04-21 16:39 ` Jonathan Cameron 2018-04-21 0:41 ` [PATCH 12/13] staging: iio: tsl2x7x: various comment cleanups Brian Masney 2018-04-21 0:41 ` Brian Masney 2018-04-21 16:37 ` Jonathan Cameron 2018-04-21 16:37 ` Jonathan Cameron 2018-04-21 0:41 ` Brian Masney [this message] 2018-04-21 0:41 ` [PATCH 13/13] staging: iio: tsl2x7x: rename prox_config to als_prox_config Brian Masney 2018-04-21 16:38 ` Jonathan Cameron 2018-04-21 16:38 ` 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=20180421004153.19073-14-masneyb@onstation.org \ --to=masneyb@onstation.org \ --cc=Jon.Brenner@ams.com \ --cc=devel@driverdev.osuosl.org \ --cc=gregkh@linuxfoundation.org \ --cc=jic23@kernel.org \ --cc=knaack.h@gmx.de \ --cc=lars@metafoo.de \ --cc=linux-iio@vger.kernel.org \ --cc=linux-kernel@vger.kernel.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.