[PATCH 1/4] staging:iio:adis16130: Remove unused includes

[PATCH 1/4] staging:iio:adis16130: Remove unused includes

[Lars-Peter Clausen]

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/staging/iio/gyro/adis16130_core.c | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index 531b803..5288635 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -6,18 +6,12 @@
  * Licensed under the GPL-2 or later.
  */
 
-#include <linux/delay.h>
 #include <linux/mutex.h>
-#include <linux/device.h>
 #include <linux/kernel.h>
 #include <linux/spi/spi.h>
-#include <linux/slab.h>
-#include <linux/sysfs.h>
-#include <linux/list.h>
 #include <linux/module.h>
 
 #include <linux/iio/iio.h>
-#include <linux/iio/sysfs.h>
 
 #define ADIS16130_CON         0x0
 #define ADIS16130_CON_RD      (1 << 6)
-- 
1.8.0

[PATCH 2/4] staging:iio:adis16130: Fix sample reading

[Lars-Peter Clausen]

The driver first does a proper read of the data register, but right after that
it does a spi_read, which will overwrite the initial result.

It looks as if the extra spi_read was accidentally introduced in commit
a5e7363ca ("staging:iio:gyro:adis16130 drop control of adc resolution."), quite
likely due to a bad rebase.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/staging/iio/gyro/adis16130_core.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index 5288635..2537f59 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -62,7 +62,6 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val)
 	spi_message_init(&msg);
 	spi_message_add_tail(&xfer, &msg);
 	ret = spi_sync(st->us, &msg);
-	ret = spi_read(st->us, st->buf, 4);
 
 	if (ret == 0)
 		*val = (st->buf[1] << 16) | (st->buf[2] << 8) | st->buf[3];
-- 
1.8.0

[PATCH 3/4] staging:iio:adis16130: Report scale and offset

[Lars-Peter Clausen]

Report scale and offset for the temperature and voltage channels.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/staging/iio/gyro/adis16130_core.c | 57 +++++++++++++++++++++++++------
 1 file changed, 47 insertions(+), 10 deletions(-)

diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
index 2537f59..8979435 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/staging/iio/gyro/adis16130_core.c
@@ -78,14 +78,47 @@ static int adis16130_read_raw(struct iio_dev *indio_dev,
 	int ret;
 	u32 temp;
 
-	/* Take the iio_dev status lock */
-	mutex_lock(&indio_dev->mlock);
-	ret =  adis16130_spi_read(indio_dev, chan->address, &temp);
-	mutex_unlock(&indio_dev->mlock);
-	if (ret)
-		return ret;
-	*val = temp;
-	return IIO_VAL_INT;
+	switch (mask) {
+	case IIO_CHAN_INFO_RAW:
+		/* Take the iio_dev status lock */
+		mutex_lock(&indio_dev->mlock);
+		ret = adis16130_spi_read(indio_dev, chan->address, &temp);
+		mutex_unlock(&indio_dev->mlock);
+		if (ret)
+			return ret;
+		*val = temp;
+		return IIO_VAL_INT;
+	case IIO_CHAN_INFO_SCALE:
+		switch (chan->type) {
+		case IIO_ANGL_VEL:
+			/* 0 degree = 838860, 250 degree = 14260608 */
+			*val = 250;
+			*val2 = 336440817; /* RAD_TO_DEGREE(14260608 - 8388608) */
+			return IIO_VAL_FRACTIONAL;
+		case IIO_TEMP:
+			/* 0C = 8036283, 105C = 9516048 */
+			*val = 105000;
+			*val2 = 9516048 - 8036283;
+			return IIO_VAL_FRACTIONAL;
+		default:
+			return -EINVAL;
+		}
+		break;
+	case IIO_CHAN_INFO_OFFSET:
+		switch (chan->type) {
+		case IIO_ANGL_VEL:
+			*val = -8388608;
+			return IIO_VAL_INT;
+		case IIO_TEMP:
+			*val = -8036283;
+			return IIO_VAL_INT;
+		default:
+			return -EINVAL;
+		}
+		break;
+	}
+
+	return -EINVAL;
 }
 
 static const struct iio_chan_spec adis16130_channels[] = {
@@ -93,13 +126,17 @@ static const struct iio_chan_spec adis16130_channels[] = {
 		.type = IIO_ANGL_VEL,
 		.modified = 1,
 		.channel2 = IIO_MOD_Z,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+			BIT(IIO_CHAN_INFO_SCALE) |
+			BIT(IIO_CHAN_INFO_OFFSET),
 		.address = ADIS16130_RATEDATA,
 	}, {
 		.type = IIO_TEMP,
 		.indexed = 1,
 		.channel = 0,
-		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
+		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
+			BIT(IIO_CHAN_INFO_SCALE) |
+			BIT(IIO_CHAN_INFO_OFFSET),
 		.address = ADIS16130_TEMPDATA,
 	}
 };
-- 
1.8.0

[PATCH 4/4] staging:iio:adis16130: Move out of staging

[Lars-Peter Clausen]

The adis16130 driver is fairly simple and it a good shape now, so move it out of
staging. Remove an outdated FIXME along the way.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/gyro/Kconfig                                           | 7 +++++++
 drivers/iio/gyro/Makefile                                          | 1 +
 .../{staging/iio/gyro/adis16130_core.c => iio/gyro/adis16130.c}    | 1 -
 drivers/staging/iio/gyro/Kconfig                                   | 7 -------
 drivers/staging/iio/gyro/Makefile                                  | 3 ---
 5 files changed, 8 insertions(+), 11 deletions(-)
 rename drivers/{staging/iio/gyro/adis16130_core.c => iio/gyro/adis16130.c} (99%)

diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
index b8daf1b..8498e9d 100644
--- a/drivers/iio/gyro/Kconfig
+++ b/drivers/iio/gyro/Kconfig
@@ -10,6 +10,13 @@ config ADIS16080
 	  Say yes here to build support for Analog Devices ADIS16080, ADIS16100 Yaw
 	  Rate Gyroscope with SPI.
 
+config ADIS16130
+	tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
+	depends on SPI
+	help
+	  Say yes here to build support for Analog Devices ADIS16130 High Precision
+	  Angular Rate Sensor driver.
+
 config ADIS16136
 	tristate "Analog devices ADIS16136 and similar gyroscopes driver"
 	depends on SPI_MASTER
diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile
index 225d289..e9dc034 100644
--- a/drivers/iio/gyro/Makefile
+++ b/drivers/iio/gyro/Makefile
@@ -3,6 +3,7 @@
 #
 
 obj-$(CONFIG_ADIS16080) += adis16080.o
+obj-$(CONFIG_ADIS16130) += adis16130.o
 obj-$(CONFIG_ADIS16136) += adis16136.o
 obj-$(CONFIG_ADXRS450) += adxrs450.o
 
diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/iio/gyro/adis16130.c
similarity index 99%
rename from drivers/staging/iio/gyro/adis16130_core.c
rename to drivers/iio/gyro/adis16130.c
index 8979435..129acdf 100644
--- a/drivers/staging/iio/gyro/adis16130_core.c
+++ b/drivers/iio/gyro/adis16130.c
@@ -183,7 +183,6 @@ error_ret:
 	return ret;
 }
 
-/* fixme, confirm ordering in this function */
 static int adis16130_remove(struct spi_device *spi)
 {
 	iio_device_unregister(spi_get_drvdata(spi));
diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
index 8360662..b433371 100644
--- a/drivers/staging/iio/gyro/Kconfig
+++ b/drivers/staging/iio/gyro/Kconfig
@@ -10,13 +10,6 @@ config ADIS16060
 	  Say yes here to build support for Analog Devices adis16060 wide bandwidth
 	  yaw rate gyroscope with SPI.
 
-config ADIS16130
-	tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
-	depends on SPI
-	help
-	  Say yes here to build support for Analog Devices ADIS16130 High Precision
-	  Angular Rate Sensor driver.
-
 config ADIS16260
 	tristate "Analog Devices ADIS16260 Digital Gyroscope Sensor SPI driver"
 	depends on SPI
diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile
index 98e6500..975f95b 100644
--- a/drivers/staging/iio/gyro/Makefile
+++ b/drivers/staging/iio/gyro/Makefile
@@ -5,8 +5,5 @@
 adis16060-y             := adis16060_core.o
 obj-$(CONFIG_ADIS16060) += adis16060.o
 
-adis16130-y             := adis16130_core.o
-obj-$(CONFIG_ADIS16130) += adis16130.o
-
 adis16260-y             := adis16260_core.o
 obj-$(CONFIG_ADIS16260) += adis16260.o
-- 
1.8.0

Re: [PATCH 1/4] staging:iio:adis16130: Remove unused includes

[Jonathan Cameron]

On 06/10/2013 03:00 PM, Lars-Peter Clausen wrote:
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git

Thanks,
> ---
>  drivers/staging/iio/gyro/adis16130_core.c | 6 ------
>  1 file changed, 6 deletions(-)
> 
> diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
> index 531b803..5288635 100644
> --- a/drivers/staging/iio/gyro/adis16130_core.c
> +++ b/drivers/staging/iio/gyro/adis16130_core.c
> @@ -6,18 +6,12 @@
>   * Licensed under the GPL-2 or later.
>   */
>  
> -#include <linux/delay.h>
>  #include <linux/mutex.h>
> -#include <linux/device.h>
>  #include <linux/kernel.h>
>  #include <linux/spi/spi.h>
> -#include <linux/slab.h>
> -#include <linux/sysfs.h>
> -#include <linux/list.h>
>  #include <linux/module.h>
>  
>  #include <linux/iio/iio.h>
> -#include <linux/iio/sysfs.h>
>  
>  #define ADIS16130_CON         0x0
>  #define ADIS16130_CON_RD      (1 << 6)
> 

Re: [PATCH 2/4] staging:iio:adis16130: Fix sample reading

[Jonathan Cameron]

On 06/10/2013 03:00 PM, Lars-Peter Clausen wrote:
> The driver first does a proper read of the data register, but right after that
> it does a spi_read, which will overwrite the initial result.
> 
> It looks as if the extra spi_read was accidentally introduced in commit
> a5e7363ca ("staging:iio:gyro:adis16130 drop control of adc resolution."), quite
> likely due to a bad rebase.
> 
oops.  This is a rather old bug now so I'm not rushing this one out. It can
wait for the next merge cycle, at which point you might want to request it is
applied to the stable trees.
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git

> ---
>  drivers/staging/iio/gyro/adis16130_core.c | 1 -
>  1 file changed, 1 deletion(-)
> 
> diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
> index 5288635..2537f59 100644
> --- a/drivers/staging/iio/gyro/adis16130_core.c
> +++ b/drivers/staging/iio/gyro/adis16130_core.c
> @@ -62,7 +62,6 @@ static int adis16130_spi_read(struct iio_dev *indio_dev, u8 reg_addr, u32 *val)
>  	spi_message_init(&msg);
>  	spi_message_add_tail(&xfer, &msg);
>  	ret = spi_sync(st->us, &msg);
> -	ret = spi_read(st->us, st->buf, 4);
>  
>  	if (ret == 0)
>  		*val = (st->buf[1] << 16) | (st->buf[2] << 8) | st->buf[3];
> 

Re: [PATCH 3/4] staging:iio:adis16130: Report scale and offset

[Jonathan Cameron]

On 06/10/2013 03:00 PM, Lars-Peter Clausen wrote:
> Report scale and offset for the temperature and voltage channels.
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git. Thanks.
> ---
>  drivers/staging/iio/gyro/adis16130_core.c | 57 +++++++++++++++++++++++++------
>  1 file changed, 47 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/staging/iio/gyro/adis16130_core.c
> index 2537f59..8979435 100644
> --- a/drivers/staging/iio/gyro/adis16130_core.c
> +++ b/drivers/staging/iio/gyro/adis16130_core.c
> @@ -78,14 +78,47 @@ static int adis16130_read_raw(struct iio_dev *indio_dev,
>  	int ret;
>  	u32 temp;
>  
> -	/* Take the iio_dev status lock */
> -	mutex_lock(&indio_dev->mlock);
> -	ret =  adis16130_spi_read(indio_dev, chan->address, &temp);
> -	mutex_unlock(&indio_dev->mlock);
> -	if (ret)
> -		return ret;
> -	*val = temp;
> -	return IIO_VAL_INT;
> +	switch (mask) {
> +	case IIO_CHAN_INFO_RAW:
> +		/* Take the iio_dev status lock */
> +		mutex_lock(&indio_dev->mlock);
> +		ret = adis16130_spi_read(indio_dev, chan->address, &temp);
> +		mutex_unlock(&indio_dev->mlock);
> +		if (ret)
> +			return ret;
> +		*val = temp;
> +		return IIO_VAL_INT;
> +	case IIO_CHAN_INFO_SCALE:
> +		switch (chan->type) {
> +		case IIO_ANGL_VEL:
> +			/* 0 degree = 838860, 250 degree = 14260608 */
> +			*val = 250;
> +			*val2 = 336440817; /* RAD_TO_DEGREE(14260608 - 8388608) */
> +			return IIO_VAL_FRACTIONAL;
> +		case IIO_TEMP:
> +			/* 0C = 8036283, 105C = 9516048 */
> +			*val = 105000;
> +			*val2 = 9516048 - 8036283;
> +			return IIO_VAL_FRACTIONAL;
> +		default:
> +			return -EINVAL;
> +		}
> +		break;
> +	case IIO_CHAN_INFO_OFFSET:
> +		switch (chan->type) {
> +		case IIO_ANGL_VEL:
> +			*val = -8388608;
> +			return IIO_VAL_INT;
> +		case IIO_TEMP:
> +			*val = -8036283;
> +			return IIO_VAL_INT;
> +		default:
> +			return -EINVAL;
> +		}
> +		break;
> +	}
> +
> +	return -EINVAL;
>  }
>  
>  static const struct iio_chan_spec adis16130_channels[] = {
> @@ -93,13 +126,17 @@ static const struct iio_chan_spec adis16130_channels[] = {
>  		.type = IIO_ANGL_VEL,
>  		.modified = 1,
>  		.channel2 = IIO_MOD_Z,
> -		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
> +		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> +			BIT(IIO_CHAN_INFO_SCALE) |
> +			BIT(IIO_CHAN_INFO_OFFSET),
>  		.address = ADIS16130_RATEDATA,
>  	}, {
>  		.type = IIO_TEMP,
>  		.indexed = 1,
>  		.channel = 0,
> -		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW),
> +		.info_mask_separate = BIT(IIO_CHAN_INFO_RAW) |
> +			BIT(IIO_CHAN_INFO_SCALE) |
> +			BIT(IIO_CHAN_INFO_OFFSET),
>  		.address = ADIS16130_TEMPDATA,
>  	}
>  };
> 

Re: [PATCH 4/4] staging:iio:adis16130: Move out of staging

[Jonathan Cameron]

On 06/10/2013 03:00 PM, Lars-Peter Clausen wrote:
> The adis16130 driver is fairly simple and it a good shape now, so move it out of
> staging. Remove an outdated FIXME along the way.
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Applied to the togreg branch of iio.git

Thanks for tidying this one up and getting out of staging.  Lots more to go ;)
> ---
>  drivers/iio/gyro/Kconfig                                           | 7 +++++++
>  drivers/iio/gyro/Makefile                                          | 1 +
>  .../{staging/iio/gyro/adis16130_core.c => iio/gyro/adis16130.c}    | 1 -
>  drivers/staging/iio/gyro/Kconfig                                   | 7 -------
>  drivers/staging/iio/gyro/Makefile                                  | 3 ---
>  5 files changed, 8 insertions(+), 11 deletions(-)
>  rename drivers/{staging/iio/gyro/adis16130_core.c => iio/gyro/adis16130.c} (99%)
> 
> diff --git a/drivers/iio/gyro/Kconfig b/drivers/iio/gyro/Kconfig
> index b8daf1b..8498e9d 100644
> --- a/drivers/iio/gyro/Kconfig
> +++ b/drivers/iio/gyro/Kconfig
> @@ -10,6 +10,13 @@ config ADIS16080
>  	  Say yes here to build support for Analog Devices ADIS16080, ADIS16100 Yaw
>  	  Rate Gyroscope with SPI.
>  
> +config ADIS16130
> +	tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
> +	depends on SPI
> +	help
> +	  Say yes here to build support for Analog Devices ADIS16130 High Precision
> +	  Angular Rate Sensor driver.
> +
>  config ADIS16136
>  	tristate "Analog devices ADIS16136 and similar gyroscopes driver"
>  	depends on SPI_MASTER
> diff --git a/drivers/iio/gyro/Makefile b/drivers/iio/gyro/Makefile
> index 225d289..e9dc034 100644
> --- a/drivers/iio/gyro/Makefile
> +++ b/drivers/iio/gyro/Makefile
> @@ -3,6 +3,7 @@
>  #
>  
>  obj-$(CONFIG_ADIS16080) += adis16080.o
> +obj-$(CONFIG_ADIS16130) += adis16130.o
>  obj-$(CONFIG_ADIS16136) += adis16136.o
>  obj-$(CONFIG_ADXRS450) += adxrs450.o
>  
> diff --git a/drivers/staging/iio/gyro/adis16130_core.c b/drivers/iio/gyro/adis16130.c
> similarity index 99%
> rename from drivers/staging/iio/gyro/adis16130_core.c
> rename to drivers/iio/gyro/adis16130.c
> index 8979435..129acdf 100644
> --- a/drivers/staging/iio/gyro/adis16130_core.c
> +++ b/drivers/iio/gyro/adis16130.c
> @@ -183,7 +183,6 @@ error_ret:
>  	return ret;
>  }
>  
> -/* fixme, confirm ordering in this function */
>  static int adis16130_remove(struct spi_device *spi)
>  {
>  	iio_device_unregister(spi_get_drvdata(spi));
> diff --git a/drivers/staging/iio/gyro/Kconfig b/drivers/staging/iio/gyro/Kconfig
> index 8360662..b433371 100644
> --- a/drivers/staging/iio/gyro/Kconfig
> +++ b/drivers/staging/iio/gyro/Kconfig
> @@ -10,13 +10,6 @@ config ADIS16060
>  	  Say yes here to build support for Analog Devices adis16060 wide bandwidth
>  	  yaw rate gyroscope with SPI.
>  
> -config ADIS16130
> -	tristate "Analog Devices ADIS16130 High Precision Angular Rate Sensor driver"
> -	depends on SPI
> -	help
> -	  Say yes here to build support for Analog Devices ADIS16130 High Precision
> -	  Angular Rate Sensor driver.
> -
>  config ADIS16260
>  	tristate "Analog Devices ADIS16260 Digital Gyroscope Sensor SPI driver"
>  	depends on SPI
> diff --git a/drivers/staging/iio/gyro/Makefile b/drivers/staging/iio/gyro/Makefile
> index 98e6500..975f95b 100644
> --- a/drivers/staging/iio/gyro/Makefile
> +++ b/drivers/staging/iio/gyro/Makefile
> @@ -5,8 +5,5 @@
>  adis16060-y             := adis16060_core.o
>  obj-$(CONFIG_ADIS16060) += adis16060.o
>  
> -adis16130-y             := adis16130_core.o
> -obj-$(CONFIG_ADIS16130) += adis16130.o
> -
>  adis16260-y             := adis16260_core.o
>  obj-$(CONFIG_ADIS16260) += adis16260.o
>