diff mbox series

[3/4] hwmon: (lm75) Add new fields into lm75_params_

Message ID 20190806091107.13322-4-iker.perez@codethink.co.uk (mailing list archive)
State Changes Requested
Headers show
Series Add support for variable sample time in lm75 driver | expand

Commit Message

Iker Perez Aug. 6, 2019, 9:11 a.m. UTC 
From: Iker Perez del Palomar Sustatxa <iker.perez@codethink.co.uk>

The new fields are included to prepare the driver for next patch. The
fields are:

* *resolutions: Stores all the supported resolutions by the device.
* num_sample_times: Stores the number of possible sample times.
* *sample_times: Stores all the possible sample times to be set.
* sample_set_masks: The set_masks for the possible sample times
* sample_clr_mask: Clear mask to set the default sample time.

Signed-off-by: Iker Perez del Palomar Sustatxa <iker.perez@codethink.co.uk>
---
 drivers/hwmon/lm75.c | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

Comments

Guenter Roeck Aug. 7, 2019, 1:51 p.m. UTC | #1 
On Tue, Aug 06, 2019 at 10:11:06AM +0100, Iker Perez wrote:
> From: Iker Perez del Palomar Sustatxa <iker.perez@codethink.co.uk>
> 
> The new fields are included to prepare the driver for next patch. The
> fields are:
> 
> * *resolutions: Stores all the supported resolutions by the device.
> * num_sample_times: Stores the number of possible sample times.
> * *sample_times: Stores all the possible sample times to be set.
> * sample_set_masks: The set_masks for the possible sample times
> * sample_clr_mask: Clear mask to set the default sample time.
> 
> Signed-off-by: Iker Perez del Palomar Sustatxa <iker.perez@codethink.co.uk>
> ---
>  drivers/hwmon/lm75.c | 26 +++++++++++++++++++++-----
>  1 file changed, 21 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
> index 477ac0732ddf..a8d0a6fb9762 100644
> --- a/drivers/hwmon/lm75.c
> +++ b/drivers/hwmon/lm75.c
> @@ -58,15 +58,24 @@ enum lm75_type {		/* keep sorted in alphabetical order */
>   *			the chip.
>   * @resolution:		Number of bits to represent the temperatue value.
>   * @resolution_limits:	Resolution range.
> + * @num_sample_times:	Number of possible sample times to be set.

Please add something like:
				Optional. Should be set if the number
				of sample times is larger than one.

>   * default_sample_time:	Sample time to be set by default.
> + * @sample_times:	All the possible sample times to be set.

Please add something like:
				Mandatory if num_sample_times is larger than 1.
				If set, number of entries must match
				num_sample_times.

> + * @sample_set_masks:	All the set_masks for the possible sample times.

Please add something like:
				Mandatory if num_sample_times is larger than 1.
				If set, number of entries must match
				num_sample_times.

> + * @sample_clr_mask:	Clear mask to set the default sample time.

Please add something like:

 * @resolutions:		List of resolutions associated with sample
				times.
				Optional. Should be set if num_sample_times is
				larger than 1, and if the resolution changes
				with sample times. If set, number of entries
				must match num_sample_times.

>   */
>  
>  struct lm75_params {
> -	u8		set_mask;
> -	u8		clr_mask;
> -	u8		default_resolution;
> -	u8		resolution_limits;
> -	unsigned int	default_sample_time;
> +	u8			set_mask;
> +	u8			clr_mask;
> +	u8			default_resolution;
> +	u8			resolution_limits;
> +	const u8		*resolutions;
> +	unsigned int		default_sample_time;
> +	u8			num_sample_times;
> +	const unsigned int	*sample_times;
> +	const u8		*sample_set_masks;
> +	u8			sample_clr_mask;
>  };
>  
>  /* Addresses scanned */
> @@ -214,7 +223,14 @@ static const struct lm75_params device_params[] = {
>  	[tmp75b] = { /* not one-shot mode, Conversion rate 37Hz */
>  		.clr_mask = 1 << 7 | 3 << 5,
>  		.default_resolution = 12,
> +		.sample_set_masks = (u8 []){ 0 << 5, 1 << 5, 2 << 5,
> +			3 << 5 },
> +		.sample_clr_mask = 3 << 5,
>  		.default_sample_time = MSEC_PER_SEC / 37,
> +		.sample_times = (unsigned int []){ MSEC_PER_SEC / 37,
> +			MSEC_PER_SEC / 18,
> +			MSEC_PER_SEC / 9, MSEC_PER_SEC / 4 },
> +		.num_sample_times = 4,
>  	},
>  	[tmp75c] = {
>  		.clr_mask = 1 << 5,	/*not one-shot mode*/
> -- 
> 2.11.0
>
diff mbox series

Patch

diff --git a/drivers/hwmon/lm75.c b/drivers/hwmon/lm75.c
index 477ac0732ddf..a8d0a6fb9762 100644
--- a/drivers/hwmon/lm75.c
+++ b/drivers/hwmon/lm75.c
@@ -58,15 +58,24 @@  enum lm75_type {		/* keep sorted in alphabetical order */
  *			the chip.
  * @resolution:		Number of bits to represent the temperatue value.
  * @resolution_limits:	Resolution range.
+ * @num_sample_times:	Number of possible sample times to be set.
  * default_sample_time:	Sample time to be set by default.
+ * @sample_times:	All the possible sample times to be set.
+ * @sample_set_masks:	All the set_masks for the possible sample times.
+ * @sample_clr_mask:	Clear mask to set the default sample time.
  */
 
 struct lm75_params {
-	u8		set_mask;
-	u8		clr_mask;
-	u8		default_resolution;
-	u8		resolution_limits;
-	unsigned int	default_sample_time;
+	u8			set_mask;
+	u8			clr_mask;
+	u8			default_resolution;
+	u8			resolution_limits;
+	const u8		*resolutions;
+	unsigned int		default_sample_time;
+	u8			num_sample_times;
+	const unsigned int	*sample_times;
+	const u8		*sample_set_masks;
+	u8			sample_clr_mask;
 };
 
 /* Addresses scanned */
@@ -214,7 +223,14 @@  static const struct lm75_params device_params[] = {
 	[tmp75b] = { /* not one-shot mode, Conversion rate 37Hz */
 		.clr_mask = 1 << 7 | 3 << 5,
 		.default_resolution = 12,
+		.sample_set_masks = (u8 []){ 0 << 5, 1 << 5, 2 << 5,
+			3 << 5 },
+		.sample_clr_mask = 3 << 5,
 		.default_sample_time = MSEC_PER_SEC / 37,
+		.sample_times = (unsigned int []){ MSEC_PER_SEC / 37,
+			MSEC_PER_SEC / 18,
+			MSEC_PER_SEC / 9, MSEC_PER_SEC / 4 },
+		.num_sample_times = 4,
 	},
 	[tmp75c] = {
 		.clr_mask = 1 << 5,	/*not one-shot mode*/