linux-iio.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] iio: accel: kxcjk-1013: Fix kxcjk10013_set_range
@ 2014-11-10  8:20 Daniel Baluta
  2014-11-15 16:13 ` Jonathan Cameron
  0 siblings, 1 reply; 2+ messages in thread
From: Daniel Baluta @ 2014-11-10  8:20 UTC (permalink / raw)
  To: jic23; +Cc: srinivas.pandruvada, linux-iio, linux-kernel

Currently, we get the new GSEL bits by OR-ing the old values
with the new ones. This only works first time when the old
values are 0.

Startup:
	* GSEL0 = 0, GSEL1 = 0

Set range to 4G: (GSEL0 = 1, GSEL1 = 0)
	* GSEL0 = 0 | 1 = 1
	* GSEL1 = 0 | 0 = 0
	* correct

Change range to 2G: (GSEL0 = 0, GSEL1 = 0)
	* GSEL0 = 1 | 0 = 1
	* GSEL1 = 0 | 0 = 0
	* wrong, GSEL0 should be 0

This has the nice effect that we can use the full scale range,
exported in in_accel_scale_available.

Fixes: a735e3d7f03 (iio: accel: kxcjk-1013: Set adjustable range)
Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
 drivers/iio/accel/kxcjk-1013.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
index 98909a9..21f1279 100644
--- a/drivers/iio/accel/kxcjk-1013.c
+++ b/drivers/iio/accel/kxcjk-1013.c
@@ -269,6 +269,8 @@ static int kxcjk1013_set_range(struct kxcjk1013_data *data, int range_index)
 		return ret;
 	}
 
+	ret &= ~(KXCJK1013_REG_CTRL1_BIT_GSEL0 |
+		 KXCJK1013_REG_CTRL1_BIT_GSEL1);
 	ret |= (KXCJK1013_scale_table[range_index].gsel_0 << 3);
 	ret |= (KXCJK1013_scale_table[range_index].gsel_1 << 4);
 
-- 
1.9.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] iio: accel: kxcjk-1013: Fix kxcjk10013_set_range
  2014-11-10  8:20 [PATCH] iio: accel: kxcjk-1013: Fix kxcjk10013_set_range Daniel Baluta
@ 2014-11-15 16:13 ` Jonathan Cameron
  0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2014-11-15 16:13 UTC (permalink / raw)
  To: Daniel Baluta; +Cc: srinivas.pandruvada, linux-iio, linux-kernel

On 10/11/14 08:20, Daniel Baluta wrote:
> Currently, we get the new GSEL bits by OR-ing the old values
> with the new ones. This only works first time when the old
> values are 0.
> 
> Startup:
> 	* GSEL0 = 0, GSEL1 = 0
> 
> Set range to 4G: (GSEL0 = 1, GSEL1 = 0)
> 	* GSEL0 = 0 | 1 = 1
> 	* GSEL1 = 0 | 0 = 0
> 	* correct
> 
> Change range to 2G: (GSEL0 = 0, GSEL1 = 0)
> 	* GSEL0 = 1 | 0 = 1
> 	* GSEL1 = 0 | 0 = 0
> 	* wrong, GSEL0 should be 0
> 
> This has the nice effect that we can use the full scale range,
> exported in in_accel_scale_available.
> 
> Fixes: a735e3d7f03 (iio: accel: kxcjk-1013: Set adjustable range)
> Signed-off-by: Daniel Baluta <daniel.baluta@intel.com>
> Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Applied to the fixes-togreg branch of iio.git and marked for stable.
Thanks,

> ---
>  drivers/iio/accel/kxcjk-1013.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/iio/accel/kxcjk-1013.c b/drivers/iio/accel/kxcjk-1013.c
> index 98909a9..21f1279 100644
> --- a/drivers/iio/accel/kxcjk-1013.c
> +++ b/drivers/iio/accel/kxcjk-1013.c
> @@ -269,6 +269,8 @@ static int kxcjk1013_set_range(struct kxcjk1013_data *data, int range_index)
>  		return ret;
>  	}
>  
> +	ret &= ~(KXCJK1013_REG_CTRL1_BIT_GSEL0 |
> +		 KXCJK1013_REG_CTRL1_BIT_GSEL1);
>  	ret |= (KXCJK1013_scale_table[range_index].gsel_0 << 3);
>  	ret |= (KXCJK1013_scale_table[range_index].gsel_1 << 4);
>  
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-11-15 16:13 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-11-10  8:20 [PATCH] iio: accel: kxcjk-1013: Fix kxcjk10013_set_range Daniel Baluta
2014-11-15 16:13 ` Jonathan Cameron

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).