[PATCH 01/11] staging:iio:ad7793: Fix VDD monitor scale

[PATCH 01/11] staging:iio:ad7793: Fix VDD monitor scale

[Lars-Peter Clausen]

The VDD monitor scale was off by a factor of 10.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
Last series before 3.8-rc1, I promise ;)
---
 drivers/staging/iio/adc/ad7793.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 691a7be..a6ea4d2 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -292,7 +292,7 @@ static int ad7793_read_raw(struct iio_dev *indio_dev,
 				return IIO_VAL_INT_PLUS_NANO;
 			} else {
 				/* 1170mV / 2^23 * 6 */
-				scale_uv = (1170ULL * 100000000ULL * 6ULL);
+				scale_uv = (1170ULL * 1000000000ULL * 6ULL);
 			}
 			break;
 		case IIO_TEMP:
-- 
1.8.0

[PATCH 02/11] staging:iio:ad7793: Fix temperature scale

[Lars-Peter Clausen]

The temperature scale was off by a factor of 1000.

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

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index a6ea4d2..965e6ae 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -297,7 +297,7 @@ static int ad7793_read_raw(struct iio_dev *indio_dev,
 			break;
 		case IIO_TEMP:
 				/* 1170mV / 0.81 mV/C / 2^23 */
-				scale_uv = 1444444444444ULL;
+				scale_uv = 1444444444444444ULL;
 			break;
 		default:
 			return -EINVAL;
-- 
1.8.0

[PATCH 03/11] staging:iio:ad7793: Use usleep_range instead of msleep

[Lars-Peter Clausen]

It is recommended to use usleep_range instead of msleep for durations smaller
than a 20ms.

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

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 965e6ae..1c3d668 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -122,7 +122,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 	ret = spi_write(st->sd.spi, (u8 *)&ret, sizeof(ret));
 	if (ret < 0)
 		goto out;
-	msleep(1); /* Wait for at least 500us */
+	usleep_range(500, 2000); /* Wait for at least 500us */
 
 	/* write/read test for device presence */
 	ret = ad_sd_read_reg(&st->sd, AD7793_REG_ID, 1, &id);
-- 
1.8.0

[PATCH 04/11] staging:iio:ad7793: Use kstrtol instead of strict_strtol

[Lars-Peter Clausen]

strict_strtol is deprecated in favor of kstrtol.

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

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 1c3d668..028473a 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -204,7 +204,7 @@ static ssize_t ad7793_write_frequency(struct device *dev,
 	}
 	mutex_unlock(&indio_dev->mlock);
 
-	ret = strict_strtol(buf, 10, &lval);
+	ret = kstrtol(buf, 10, &lval);
 	if (ret)
 		return ret;
 
-- 
1.8.0

[PATCH 05/11] staging:iio:ad7793: Rework platform data

[Lars-Peter Clausen]

Currently the platform data for the ad7793 consist just out of the raw default
register settings. This has some downsides, for one we actually don't want to
make all bits configurable and secondly not all register settings are actually
valid. This patch exposes all the options which should be configurable via
platform data as induvidual platform data struct fields. This also allows us to
document the different settings via proper kernel doc.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/staging/iio/adc/ad7793.c |  25 +++++++--
 drivers/staging/iio/adc/ad7793.h | 107 +++++++++++++++++++++++++++++++++++++--
 2 files changed, 123 insertions(+), 9 deletions(-)

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 028473a..8b08693 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -118,6 +118,12 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 	unsigned long long scale_uv;
 	u32 id;
 
+	if ((pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT1 ||
+		pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT2) &&
+		((pdata->exitation_current != AD7793_IX_10uA) &&
+		(pdata->exitation_current != AD7793_IX_210uA)))
+		return -EINVAL;
+
 	/* reset the serial interface */
 	ret = spi_write(st->sd.spi, (u8 *)&ret, sizeof(ret));
 	if (ret < 0)
@@ -136,8 +142,18 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 		goto out;
 	}
 
-	st->mode = pdata->mode;
-	st->conf = pdata->conf;
+	st->mode = AD7793_MODE_RATE(1);
+	st->mode |= AD7793_MODE_CLKSRC(pdata->clock_src);
+	st->conf = AD7793_CONF_REFSEL(pdata->refsel);
+	st->conf |= AD7793_CONF_VBIAS(pdata->bias_voltage);
+	if (pdata->buffered)
+		st->conf |= AD7793_CONF_BUF;
+	if (pdata->boost_enable)
+		st->conf |= AD7793_CONF_BOOST;
+	if (pdata->burnout_current)
+		st->conf |= AD7793_CONF_BO_EN;
+	if (pdata->unipolar)
+		st->conf |= AD7793_CONF_UNIPOLAR;
 
 	ret = ad7793_set_mode(&st->sd, AD_SD_MODE_IDLE);
 	if (ret)
@@ -147,8 +163,9 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 	if (ret)
 		goto out;
 
-	ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO,
-			       sizeof(pdata->io), pdata->io);
+	ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO, 1,
+				   pdata->exitation_current |
+			       (pdata->current_source_direction << 2));
 	if (ret)
 		goto out;
 
diff --git a/drivers/staging/iio/adc/ad7793.h b/drivers/staging/iio/adc/ad7793.h
index 8fdd450..9e90590 100644
--- a/drivers/staging/iio/adc/ad7793.h
+++ b/drivers/staging/iio/adc/ad7793.h
@@ -68,7 +68,7 @@
 #define AD7793_CONF_UNIPOLAR	(1 << 12) /* Unipolar/Bipolar Enable */
 #define AD7793_CONF_BOOST	(1 << 11) /* Boost Enable */
 #define AD7793_CONF_GAIN(x)	(((x) & 0x7) << 8) /* Gain Select */
-#define AD7793_CONF_REFSEL	(1 << 7) /* INT/EXT Reference Select */
+#define AD7793_CONF_REFSEL(x)	((x) << 6) /* INT/EXT Reference Select */
 #define AD7793_CONF_BUF		(1 << 4) /* Buffered Mode Enable */
 #define AD7793_CONF_CHAN(x)	((x) & 0xf) /* Channel select */
 #define AD7793_CONF_CHAN_MASK	0xf /* Channel select mask */
@@ -105,11 +105,108 @@
 #define AD7793_IO_IXCEN_210uA	(2 << 0) /* Excitation Current 210uA */
 #define AD7793_IO_IXCEN_1mA	(3 << 0) /* Excitation Current 1mA */
 
+/**
+ * enum ad7793_clock_source - AD7793 clock source selection
+ * @AD7793_CLK_SRC_INT: Internal 64 kHz clock, not available at the CLK pin.
+ * @AD7793_CLK_SRC_INT_CO: Internal 64 kHz clock, available at the CLK pin.
+ * @AD7793_CLK_SRC_EXT: Use external clock.
+ * @AD7793_CLK_SRC_EXT_DIV2: Use external clock divided by 2.
+ */
+enum ad7793_clock_source {
+	AD7793_CLK_SRC_INT,
+	AD7793_CLK_SRC_INT_CO,
+	AD7793_CLK_SRC_EXT,
+	AD7793_CLK_SRC_EXT_DIV2,
+};
+
+/**
+ * enum ad7793_bias_voltage - AD7793 bias voltage selection
+ * @AD7793_BIAS_VOLTAGE_DISABLED: Bias voltage generator disabled
+ * @AD7793_BIAS_VOLTAGE_AIN1: Bias voltage connected to AIN1(-).
+ * @AD7793_BIAS_VOLTAGE_AIN2: Bias voltage connected to AIN2(-).
+ * @AD7793_BIAS_VOLTAGE_AIN3: Bias voltage connected to AIN3(-).
+ *	Only valid for AD7795/AD7796.
+ */
+enum ad7793_bias_voltage {
+	AD7793_BIAS_VOLTAGE_DISABLED,
+	AD7793_BIAS_VOLTAGE_AIN1,
+	AD7793_BIAS_VOLTAGE_AIN2,
+	AD7793_BIAS_VOLTAGE_AIN3,
+};
+
+/**
+ * enum ad7793_refsel - AD7793 reference voltage selection
+ * @AD7793_REFSEL_REFIN1: External reference applied between REFIN1(+)
+ *	and REFIN1(-).
+ * @AD7793_REFSEL_REFIN2: External reference applied between REFIN2(+) and
+ *	and REFIN1(-). Only valid for AD7795/AD7796.
+ * @AD7793_REFSEL_INTERNAL: Internal 1.17 V reference.
+ */
+enum ad7793_refsel {
+	AD7793_REFSEL_REFIN1 = 0,
+	AD7793_REFSEL_REFIN2 = 1,
+	AD7793_REFSEL_INTERNAL = 2,
+};
+
+/**
+ * enum ad7793_current_source_direction - AD7793 excitation current direction
+ * @AD7793_IEXEC1_IOUT1_IEXEC2_IOUT2: Current source IEXC1 connected to pin
+ *	IOUT1, current source IEXC2 connected to pin IOUT2.
+ * @AD7793_IEXEC1_IOUT2_IEXEC2_IOUT1: Current source IEXC2 connected to pin
+ *	IOUT1, current source IEXC1 connected to pin IOUT2.
+ * @AD7793_IEXEC1_IEXEC2_IOUT1: Both current sources connected to pin IOUT1.
+ *	Only valid when the current sources are set to 10 uA or 210 uA.
+ * @AD7793_IEXEC1_IEXEC2_IOUT2: Both current sources connected to Pin IOUT2.
+ *	Only valid when the current ources are set to 10 uA or 210 uA.
+ */
+enum ad7793_current_source_direction {
+	AD7793_IEXEC1_IOUT1_IEXEC2_IOUT2 = 0,
+	AD7793_IEXEC1_IOUT2_IEXEC2_IOUT1 = 1,
+	AD7793_IEXEC1_IEXEC2_IOUT1 = 2,
+	AD7793_IEXEC1_IEXEC2_IOUT2 = 3,
+};
+
+/**
+ * enum ad7793_excitation_current - AD7793 excitation current selection
+ * @AD7793_IX_DISABLED: Excitation current Disabled.
+ * @AD7793_IX_10uA: Enable 10 micro-ampere excitation current.
+ * @AD7793_IX_210uA: Enable 210 micro-ampere excitation current.
+ * @AD7793_IX_1mA: Enable 1 milli-Ampere excitation current.
+ */
+enum ad7793_excitation_current {
+	AD7793_IX_DISABLED = 0,
+	AD7793_IX_10uA = 1,
+	AD7793_IX_210uA = 2,
+	AD7793_IX_1mA = 3,
+};
+
+/**
+ * struct ad7793_platform_data - AD7793 platform data
+ * @vref_mv: Reference voltage in milli-Volt
+ * @clock_src: Clock source selection
+ * @burnout_current: If set to true the 100nA burnout current is enabled.
+ * @boost_enable: Enable boost for the bias voltage generator.
+ * @buffered: If set to true configure the device for buffered input mode.
+ * @unipolar: If set to true sample in unipolar mode, if set to false sample in
+ *		bipolar mode.
+ * @refsel: Reference voltage selection
+ * @bias_voltage: Bias voltage selection
+ * @exitation_current: Excitation current selection
+ * @current_source_direction: Excitation current direction selection
+ */
 struct ad7793_platform_data {
-	u16			vref_mv;
-	u16			mode;
-	u16			conf;
-	u8			io;
+	u16 vref_mv;
+
+	enum ad7793_clock_source clock_src;
+	bool burnout_current;
+	bool boost_enable;
+	bool buffered;
+	bool unipolar;
+
+	enum ad7793_refsel refsel;
+	enum ad7793_bias_voltage bias_voltage;
+	enum ad7793_excitation_current exitation_current;
+	enum ad7793_current_source_direction current_source_direction;
 };
 
 #endif /* IIO_ADC_AD7793_H_ */
-- 
1.8.0

Re: [PATCH 05/11] staging:iio:ad7793: Rework platform data

[Jonathan Cameron]

On 11/21/2012 04:27 PM, Lars-Peter Clausen wrote:
> Currently the platform data for the ad7793 consist just out of the raw default
> register settings. This has some downsides, for one we actually don't want to
> make all bits configurable and secondly not all register settings are actually
> valid. This patch exposes all the options which should be configurable via
> platform data as induvidual platform data struct fields. This also allows us to
> document the different settings via proper kernel doc.
>
Good to see this cleared up.

> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
added (as have previous patches to togreg branch of iio.git)


> ---
>  drivers/staging/iio/adc/ad7793.c |  25 +++++++--
>  drivers/staging/iio/adc/ad7793.h | 107 +++++++++++++++++++++++++++++++++++++--
>  2 files changed, 123 insertions(+), 9 deletions(-)
>
> diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
> index 028473a..8b08693 100644
> --- a/drivers/staging/iio/adc/ad7793.c
> +++ b/drivers/staging/iio/adc/ad7793.c
> @@ -118,6 +118,12 @@ static int ad7793_setup(struct iio_dev *indio_dev,
>  	unsigned long long scale_uv;
>  	u32 id;
>
> +	if ((pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT1 ||
> +		pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT2) &&
> +		((pdata->exitation_current != AD7793_IX_10uA) &&
> +		(pdata->exitation_current != AD7793_IX_210uA)))
> +		return -EINVAL;
> +
>  	/* reset the serial interface */
>  	ret = spi_write(st->sd.spi, (u8 *)&ret, sizeof(ret));
>  	if (ret < 0)
> @@ -136,8 +142,18 @@ static int ad7793_setup(struct iio_dev *indio_dev,
>  		goto out;
>  	}
>
> -	st->mode = pdata->mode;
> -	st->conf = pdata->conf;
> +	st->mode = AD7793_MODE_RATE(1);
> +	st->mode |= AD7793_MODE_CLKSRC(pdata->clock_src);
> +	st->conf = AD7793_CONF_REFSEL(pdata->refsel);
> +	st->conf |= AD7793_CONF_VBIAS(pdata->bias_voltage);
> +	if (pdata->buffered)
> +		st->conf |= AD7793_CONF_BUF;
> +	if (pdata->boost_enable)
> +		st->conf |= AD7793_CONF_BOOST;
> +	if (pdata->burnout_current)
> +		st->conf |= AD7793_CONF_BO_EN;
> +	if (pdata->unipolar)
> +		st->conf |= AD7793_CONF_UNIPOLAR;
>
>  	ret = ad7793_set_mode(&st->sd, AD_SD_MODE_IDLE);
>  	if (ret)
> @@ -147,8 +163,9 @@ static int ad7793_setup(struct iio_dev *indio_dev,
>  	if (ret)
>  		goto out;
>
> -	ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO,
> -			       sizeof(pdata->io), pdata->io);
> +	ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO, 1,
> +				   pdata->exitation_current |
> +			       (pdata->current_source_direction << 2));
>  	if (ret)
>  		goto out;
>
> diff --git a/drivers/staging/iio/adc/ad7793.h b/drivers/staging/iio/adc/ad7793.h
> index 8fdd450..9e90590 100644
> --- a/drivers/staging/iio/adc/ad7793.h
> +++ b/drivers/staging/iio/adc/ad7793.h
> @@ -68,7 +68,7 @@
>  #define AD7793_CONF_UNIPOLAR	(1 << 12) /* Unipolar/Bipolar Enable */
>  #define AD7793_CONF_BOOST	(1 << 11) /* Boost Enable */
>  #define AD7793_CONF_GAIN(x)	(((x) & 0x7) << 8) /* Gain Select */
> -#define AD7793_CONF_REFSEL	(1 << 7) /* INT/EXT Reference Select */
> +#define AD7793_CONF_REFSEL(x)	((x) << 6) /* INT/EXT Reference Select */
>  #define AD7793_CONF_BUF		(1 << 4) /* Buffered Mode Enable */
>  #define AD7793_CONF_CHAN(x)	((x) & 0xf) /* Channel select */
>  #define AD7793_CONF_CHAN_MASK	0xf /* Channel select mask */
> @@ -105,11 +105,108 @@
>  #define AD7793_IO_IXCEN_210uA	(2 << 0) /* Excitation Current 210uA */
>  #define AD7793_IO_IXCEN_1mA	(3 << 0) /* Excitation Current 1mA */
>
> +/**
> + * enum ad7793_clock_source - AD7793 clock source selection
> + * @AD7793_CLK_SRC_INT: Internal 64 kHz clock, not available at the CLK pin.
> + * @AD7793_CLK_SRC_INT_CO: Internal 64 kHz clock, available at the CLK pin.
> + * @AD7793_CLK_SRC_EXT: Use external clock.
> + * @AD7793_CLK_SRC_EXT_DIV2: Use external clock divided by 2.
> + */
> +enum ad7793_clock_source {
> +	AD7793_CLK_SRC_INT,
> +	AD7793_CLK_SRC_INT_CO,
> +	AD7793_CLK_SRC_EXT,
> +	AD7793_CLK_SRC_EXT_DIV2,
> +};
> +
> +/**
> + * enum ad7793_bias_voltage - AD7793 bias voltage selection
> + * @AD7793_BIAS_VOLTAGE_DISABLED: Bias voltage generator disabled
> + * @AD7793_BIAS_VOLTAGE_AIN1: Bias voltage connected to AIN1(-).
> + * @AD7793_BIAS_VOLTAGE_AIN2: Bias voltage connected to AIN2(-).
> + * @AD7793_BIAS_VOLTAGE_AIN3: Bias voltage connected to AIN3(-).
> + *	Only valid for AD7795/AD7796.
> + */
> +enum ad7793_bias_voltage {
> +	AD7793_BIAS_VOLTAGE_DISABLED,
> +	AD7793_BIAS_VOLTAGE_AIN1,
> +	AD7793_BIAS_VOLTAGE_AIN2,
> +	AD7793_BIAS_VOLTAGE_AIN3,
> +};
> +
> +/**
> + * enum ad7793_refsel - AD7793 reference voltage selection
> + * @AD7793_REFSEL_REFIN1: External reference applied between REFIN1(+)
> + *	and REFIN1(-).
> + * @AD7793_REFSEL_REFIN2: External reference applied between REFIN2(+) and
> + *	and REFIN1(-). Only valid for AD7795/AD7796.
> + * @AD7793_REFSEL_INTERNAL: Internal 1.17 V reference.
> + */
> +enum ad7793_refsel {
> +	AD7793_REFSEL_REFIN1 = 0,
> +	AD7793_REFSEL_REFIN2 = 1,
> +	AD7793_REFSEL_INTERNAL = 2,
> +};
> +
> +/**
> + * enum ad7793_current_source_direction - AD7793 excitation current direction
> + * @AD7793_IEXEC1_IOUT1_IEXEC2_IOUT2: Current source IEXC1 connected to pin
> + *	IOUT1, current source IEXC2 connected to pin IOUT2.
> + * @AD7793_IEXEC1_IOUT2_IEXEC2_IOUT1: Current source IEXC2 connected to pin
> + *	IOUT1, current source IEXC1 connected to pin IOUT2.
> + * @AD7793_IEXEC1_IEXEC2_IOUT1: Both current sources connected to pin IOUT1.
> + *	Only valid when the current sources are set to 10 uA or 210 uA.
> + * @AD7793_IEXEC1_IEXEC2_IOUT2: Both current sources connected to Pin IOUT2.
> + *	Only valid when the current ources are set to 10 uA or 210 uA.
> + */
> +enum ad7793_current_source_direction {
> +	AD7793_IEXEC1_IOUT1_IEXEC2_IOUT2 = 0,
> +	AD7793_IEXEC1_IOUT2_IEXEC2_IOUT1 = 1,
> +	AD7793_IEXEC1_IEXEC2_IOUT1 = 2,
> +	AD7793_IEXEC1_IEXEC2_IOUT2 = 3,
> +};
> +
> +/**
> + * enum ad7793_excitation_current - AD7793 excitation current selection
> + * @AD7793_IX_DISABLED: Excitation current Disabled.
> + * @AD7793_IX_10uA: Enable 10 micro-ampere excitation current.
> + * @AD7793_IX_210uA: Enable 210 micro-ampere excitation current.
> + * @AD7793_IX_1mA: Enable 1 milli-Ampere excitation current.
> + */
> +enum ad7793_excitation_current {
> +	AD7793_IX_DISABLED = 0,
> +	AD7793_IX_10uA = 1,
> +	AD7793_IX_210uA = 2,
> +	AD7793_IX_1mA = 3,
> +};
> +
> +/**
> + * struct ad7793_platform_data - AD7793 platform data
> + * @vref_mv: Reference voltage in milli-Volt
> + * @clock_src: Clock source selection
> + * @burnout_current: If set to true the 100nA burnout current is enabled.
> + * @boost_enable: Enable boost for the bias voltage generator.
> + * @buffered: If set to true configure the device for buffered input mode.
> + * @unipolar: If set to true sample in unipolar mode, if set to false sample in
> + *		bipolar mode.
> + * @refsel: Reference voltage selection
> + * @bias_voltage: Bias voltage selection
> + * @exitation_current: Excitation current selection
> + * @current_source_direction: Excitation current direction selection
> + */
>  struct ad7793_platform_data {
> -	u16			vref_mv;
> -	u16			mode;
> -	u16			conf;
> -	u8			io;
> +	u16 vref_mv;
> +
> +	enum ad7793_clock_source clock_src;
> +	bool burnout_current;
> +	bool boost_enable;
> +	bool buffered;
> +	bool unipolar;
> +
> +	enum ad7793_refsel refsel;
> +	enum ad7793_bias_voltage bias_voltage;
> +	enum ad7793_excitation_current exitation_current;
> +	enum ad7793_current_source_direction current_source_direction;
>  };
>
>  #endif /* IIO_ADC_AD7793_H_ */
>

[PATCH 06/11] staging:iio:ad7793: Rework regulator handling

[Lars-Peter Clausen]

Rework the regulator handling of the driver to match more closely what we do in
other drivers. Make the regulator non-optional if a external reference is used.
Also dispose the option of specifying the reference voltage via platform data.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/staging/iio/adc/ad7793.c | 44 ++++++++++++++++++++++++----------------
 drivers/staging/iio/adc/ad7793.h |  3 ---
 2 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 8b08693..1aa8e88 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -111,7 +111,8 @@ static int ad7793_calibrate_all(struct ad7793_state *st)
 }
 
 static int ad7793_setup(struct iio_dev *indio_dev,
-	const struct ad7793_platform_data *pdata)
+	const struct ad7793_platform_data *pdata,
+	unsigned int vref_mv)
 {
 	struct ad7793_state *st = iio_priv(indio_dev);
 	int i, ret = -1;
@@ -175,7 +176,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 
 	/* Populate available ADC input ranges */
 	for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++) {
-		scale_uv = ((u64)st->int_vref_mv * 100000000)
+		scale_uv = ((u64)vref_mv * 100000000)
 			>> (st->chip_info->channels[0].scan_type.realbits -
 			(!!(st->conf & AD7793_CONF_UNIPOLAR) ? 0 : 1));
 		scale_uv >>= i;
@@ -463,7 +464,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
 	const struct ad7793_platform_data *pdata = spi->dev.platform_data;
 	struct ad7793_state *st;
 	struct iio_dev *indio_dev;
-	int ret, voltage_uv = 0;
+	int ret, vref_mv = 0;
 
 	if (!pdata) {
 		dev_err(&spi->dev, "no platform data?\n");
@@ -483,25 +484,31 @@ static int __devinit ad7793_probe(struct spi_device *spi)
 
 	ad_sd_init(&st->sd, indio_dev, spi, &ad7793_sigma_delta_info);
 
-	st->reg = regulator_get(&spi->dev, "vcc");
-	if (!IS_ERR(st->reg)) {
+	if (pdata->refsel != AD7793_REFSEL_INTERNAL) {
+		st->reg = regulator_get(&spi->dev, "refin");
+		if (IS_ERR(st->reg)) {
+			ret = PTR_ERR(st->reg);
+			goto error_device_free;
+		}
+
 		ret = regulator_enable(st->reg);
 		if (ret)
 			goto error_put_reg;
 
-		voltage_uv = regulator_get_voltage(st->reg);
+		vref_mv = regulator_get_voltage(st->reg);
+		if (vref_mv < 0) {
+			ret = vref_mv;
+			goto error_disable_reg;
+		}
+
+		vref_mv /= 1000;
+	} else {
+		vref_mv = 1170; /* Build-in ref */
 	}
 
 	st->chip_info =
 		&ad7793_chip_info_tbl[spi_get_device_id(spi)->driver_data];
 
-	if (pdata && pdata->vref_mv)
-		st->int_vref_mv = pdata->vref_mv;
-	else if (voltage_uv)
-		st->int_vref_mv = voltage_uv / 1000;
-	else
-		st->int_vref_mv = 1170; /* Build-in ref */
-
 	spi_set_drvdata(spi, indio_dev);
 
 	indio_dev->dev.parent = &spi->dev;
@@ -515,7 +522,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
 	if (ret)
 		goto error_disable_reg;
 
-	ret = ad7793_setup(indio_dev, pdata);
+	ret = ad7793_setup(indio_dev, pdata, vref_mv);
 	if (ret)
 		goto error_remove_trigger;
 
@@ -528,12 +535,12 @@ static int __devinit ad7793_probe(struct spi_device *spi)
 error_remove_trigger:
 	ad_sd_cleanup_buffer_and_trigger(indio_dev);
 error_disable_reg:
-	if (!IS_ERR(st->reg))
+	if (pdata->refsel != AD7793_REFSEL_INTERNAL)
 		regulator_disable(st->reg);
 error_put_reg:
-	if (!IS_ERR(st->reg))
+	if (pdata->refsel != AD7793_REFSEL_INTERNAL)
 		regulator_put(st->reg);
-
+error_device_free:
 	iio_device_free(indio_dev);
 
 	return ret;
@@ -541,13 +548,14 @@ error_put_reg:
 
 static int __devexit ad7793_remove(struct spi_device *spi)
 {
+	const struct ad7793_platform_data *pdata = spi->dev.platform_data;
 	struct iio_dev *indio_dev = spi_get_drvdata(spi);
 	struct ad7793_state *st = iio_priv(indio_dev);
 
 	iio_device_unregister(indio_dev);
 	ad_sd_cleanup_buffer_and_trigger(indio_dev);
 
-	if (!IS_ERR(st->reg)) {
+	if (pdata->refsel != AD7793_REFSEL_INTERNAL) {
 		regulator_disable(st->reg);
 		regulator_put(st->reg);
 	}
diff --git a/drivers/staging/iio/adc/ad7793.h b/drivers/staging/iio/adc/ad7793.h
index 9e90590..7f6acac 100644
--- a/drivers/staging/iio/adc/ad7793.h
+++ b/drivers/staging/iio/adc/ad7793.h
@@ -182,7 +182,6 @@ enum ad7793_excitation_current {
 
 /**
  * struct ad7793_platform_data - AD7793 platform data
- * @vref_mv: Reference voltage in milli-Volt
  * @clock_src: Clock source selection
  * @burnout_current: If set to true the 100nA burnout current is enabled.
  * @boost_enable: Enable boost for the bias voltage generator.
@@ -195,8 +194,6 @@ enum ad7793_excitation_current {
  * @current_source_direction: Excitation current direction selection
  */
 struct ad7793_platform_data {
-	u16 vref_mv;
-
 	enum ad7793_clock_source clock_src;
 	bool burnout_current;
 	bool boost_enable;
-- 
1.8.0

Re: [PATCH 06/11] staging:iio:ad7793: Rework regulator handling

[Jonathan Cameron]

On 11/21/2012 04:27 PM, Lars-Peter Clausen wrote:
> Rework the regulator handling of the driver to match more closely what we do in
> other drivers. Make the regulator non-optional if a external reference is used.
> Also dispose the option of specifying the reference voltage via platform data.
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
This one curriously had 2 lines of fuzz.  Ah well.

Added to togreg branch of iio.git
> ---
>  drivers/staging/iio/adc/ad7793.c | 44 ++++++++++++++++++++++++----------------
>  drivers/staging/iio/adc/ad7793.h |  3 ---
>  2 files changed, 26 insertions(+), 21 deletions(-)
> 
> diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
> index 8b08693..1aa8e88 100644
> --- a/drivers/staging/iio/adc/ad7793.c
> +++ b/drivers/staging/iio/adc/ad7793.c
> @@ -111,7 +111,8 @@ static int ad7793_calibrate_all(struct ad7793_state *st)
>  }
>  
>  static int ad7793_setup(struct iio_dev *indio_dev,
> -	const struct ad7793_platform_data *pdata)
> +	const struct ad7793_platform_data *pdata,
> +	unsigned int vref_mv)
>  {
>  	struct ad7793_state *st = iio_priv(indio_dev);
>  	int i, ret = -1;
> @@ -175,7 +176,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
>  
>  	/* Populate available ADC input ranges */
>  	for (i = 0; i < ARRAY_SIZE(st->scale_avail); i++) {
> -		scale_uv = ((u64)st->int_vref_mv * 100000000)
> +		scale_uv = ((u64)vref_mv * 100000000)
>  			>> (st->chip_info->channels[0].scan_type.realbits -
>  			(!!(st->conf & AD7793_CONF_UNIPOLAR) ? 0 : 1));
>  		scale_uv >>= i;
> @@ -463,7 +464,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
>  	const struct ad7793_platform_data *pdata = spi->dev.platform_data;
>  	struct ad7793_state *st;
>  	struct iio_dev *indio_dev;
> -	int ret, voltage_uv = 0;
> +	int ret, vref_mv = 0;
>  
>  	if (!pdata) {
>  		dev_err(&spi->dev, "no platform data?\n");
> @@ -483,25 +484,31 @@ static int __devinit ad7793_probe(struct spi_device *spi)
>  
>  	ad_sd_init(&st->sd, indio_dev, spi, &ad7793_sigma_delta_info);
>  
> -	st->reg = regulator_get(&spi->dev, "vcc");
> -	if (!IS_ERR(st->reg)) {
> +	if (pdata->refsel != AD7793_REFSEL_INTERNAL) {
> +		st->reg = regulator_get(&spi->dev, "refin");
> +		if (IS_ERR(st->reg)) {
> +			ret = PTR_ERR(st->reg);
> +			goto error_device_free;
> +		}
> +
>  		ret = regulator_enable(st->reg);
>  		if (ret)
>  			goto error_put_reg;
>  
> -		voltage_uv = regulator_get_voltage(st->reg);
> +		vref_mv = regulator_get_voltage(st->reg);
> +		if (vref_mv < 0) {
> +			ret = vref_mv;
> +			goto error_disable_reg;
> +		}
> +
> +		vref_mv /= 1000;
> +	} else {
> +		vref_mv = 1170; /* Build-in ref */
>  	}
>  
>  	st->chip_info =
>  		&ad7793_chip_info_tbl[spi_get_device_id(spi)->driver_data];
>  
> -	if (pdata && pdata->vref_mv)
> -		st->int_vref_mv = pdata->vref_mv;
> -	else if (voltage_uv)
> -		st->int_vref_mv = voltage_uv / 1000;
> -	else
> -		st->int_vref_mv = 1170; /* Build-in ref */
> -
>  	spi_set_drvdata(spi, indio_dev);
>  
>  	indio_dev->dev.parent = &spi->dev;
> @@ -515,7 +522,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
>  	if (ret)
>  		goto error_disable_reg;
>  
> -	ret = ad7793_setup(indio_dev, pdata);
> +	ret = ad7793_setup(indio_dev, pdata, vref_mv);
>  	if (ret)
>  		goto error_remove_trigger;
>  
> @@ -528,12 +535,12 @@ static int __devinit ad7793_probe(struct spi_device *spi)
>  error_remove_trigger:
>  	ad_sd_cleanup_buffer_and_trigger(indio_dev);
>  error_disable_reg:
> -	if (!IS_ERR(st->reg))
> +	if (pdata->refsel != AD7793_REFSEL_INTERNAL)
>  		regulator_disable(st->reg);
>  error_put_reg:
> -	if (!IS_ERR(st->reg))
> +	if (pdata->refsel != AD7793_REFSEL_INTERNAL)
>  		regulator_put(st->reg);
> -
> +error_device_free:
>  	iio_device_free(indio_dev);
>  
>  	return ret;
> @@ -541,13 +548,14 @@ error_put_reg:
>  
>  static int __devexit ad7793_remove(struct spi_device *spi)
>  {
> +	const struct ad7793_platform_data *pdata = spi->dev.platform_data;
>  	struct iio_dev *indio_dev = spi_get_drvdata(spi);
>  	struct ad7793_state *st = iio_priv(indio_dev);
>  
>  	iio_device_unregister(indio_dev);
>  	ad_sd_cleanup_buffer_and_trigger(indio_dev);
>  
> -	if (!IS_ERR(st->reg)) {
> +	if (pdata->refsel != AD7793_REFSEL_INTERNAL) {
>  		regulator_disable(st->reg);
>  		regulator_put(st->reg);
>  	}
> diff --git a/drivers/staging/iio/adc/ad7793.h b/drivers/staging/iio/adc/ad7793.h
> index 9e90590..7f6acac 100644
> --- a/drivers/staging/iio/adc/ad7793.h
> +++ b/drivers/staging/iio/adc/ad7793.h
> @@ -182,7 +182,6 @@ enum ad7793_excitation_current {
>  
>  /**
>   * struct ad7793_platform_data - AD7793 platform data
> - * @vref_mv: Reference voltage in milli-Volt
>   * @clock_src: Clock source selection
>   * @burnout_current: If set to true the 100nA burnout current is enabled.
>   * @boost_enable: Enable boost for the bias voltage generator.
> @@ -195,8 +194,6 @@ enum ad7793_excitation_current {
>   * @current_source_direction: Excitation current direction selection
>   */
>  struct ad7793_platform_data {
> -	u16 vref_mv;
> -
>  	enum ad7793_clock_source clock_src;
>  	bool burnout_current;
>  	bool boost_enable;
> 

[PATCH 07/11] staging:iio:ad7793: Move register definitions from header to source

[Lars-Peter Clausen]

The only user of the register definitions is the driver itself, so move them
from the header file to the driver source file. The header file now only
contains the platform data struct.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/staging/iio/adc/ad7793.c | 93 ++++++++++++++++++++++++++++++++++++++++
 drivers/staging/iio/adc/ad7793.h | 93 ----------------------------------------
 2 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index 1aa8e88..cbe8a02 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -28,6 +28,99 @@
 
 #include "ad7793.h"
 
+/* Registers */
+#define AD7793_REG_COMM		0 /* Communications Register (WO, 8-bit) */
+#define AD7793_REG_STAT		0 /* Status Register	     (RO, 8-bit) */
+#define AD7793_REG_MODE		1 /* Mode Register	     (RW, 16-bit */
+#define AD7793_REG_CONF		2 /* Configuration Register  (RW, 16-bit) */
+#define AD7793_REG_DATA		3 /* Data Register	     (RO, 16-/24-bit) */
+#define AD7793_REG_ID		4 /* ID Register	     (RO, 8-bit) */
+#define AD7793_REG_IO		5 /* IO Register	     (RO, 8-bit) */
+#define AD7793_REG_OFFSET	6 /* Offset Register	     (RW, 16-bit
+				   * (AD7792)/24-bit (AD7793)) */
+#define AD7793_REG_FULLSALE	7 /* Full-Scale Register
+				   * (RW, 16-bit (AD7792)/24-bit (AD7793)) */
+
+/* Communications Register Bit Designations (AD7793_REG_COMM) */
+#define AD7793_COMM_WEN		(1 << 7) /* Write Enable */
+#define AD7793_COMM_WRITE	(0 << 6) /* Write Operation */
+#define AD7793_COMM_READ	(1 << 6) /* Read Operation */
+#define AD7793_COMM_ADDR(x)	(((x) & 0x7) << 3) /* Register Address */
+#define AD7793_COMM_CREAD	(1 << 2) /* Continuous Read of Data Register */
+
+/* Status Register Bit Designations (AD7793_REG_STAT) */
+#define AD7793_STAT_RDY		(1 << 7) /* Ready */
+#define AD7793_STAT_ERR		(1 << 6) /* Error (Overrange, Underrange) */
+#define AD7793_STAT_CH3		(1 << 2) /* Channel 3 */
+#define AD7793_STAT_CH2		(1 << 1) /* Channel 2 */
+#define AD7793_STAT_CH1		(1 << 0) /* Channel 1 */
+
+/* Mode Register Bit Designations (AD7793_REG_MODE) */
+#define AD7793_MODE_SEL(x)	(((x) & 0x7) << 13) /* Operation Mode Select */
+#define AD7793_MODE_SEL_MASK	(0x7 << 13) /* Operation Mode Select mask */
+#define AD7793_MODE_CLKSRC(x)	(((x) & 0x3) << 6) /* ADC Clock Source Select */
+#define AD7793_MODE_RATE(x)	((x) & 0xF) /* Filter Update Rate Select */
+
+#define AD7793_MODE_CONT		0 /* Continuous Conversion Mode */
+#define AD7793_MODE_SINGLE		1 /* Single Conversion Mode */
+#define AD7793_MODE_IDLE		2 /* Idle Mode */
+#define AD7793_MODE_PWRDN		3 /* Power-Down Mode */
+#define AD7793_MODE_CAL_INT_ZERO	4 /* Internal Zero-Scale Calibration */
+#define AD7793_MODE_CAL_INT_FULL	5 /* Internal Full-Scale Calibration */
+#define AD7793_MODE_CAL_SYS_ZERO	6 /* System Zero-Scale Calibration */
+#define AD7793_MODE_CAL_SYS_FULL	7 /* System Full-Scale Calibration */
+
+#define AD7793_CLK_INT		0 /* Internal 64 kHz Clock not
+				   * available at the CLK pin */
+#define AD7793_CLK_INT_CO	1 /* Internal 64 kHz Clock available
+				   * at the CLK pin */
+#define AD7793_CLK_EXT		2 /* External 64 kHz Clock */
+#define AD7793_CLK_EXT_DIV2	3 /* External Clock divided by 2 */
+
+/* Configuration Register Bit Designations (AD7793_REG_CONF) */
+#define AD7793_CONF_VBIAS(x)	(((x) & 0x3) << 14) /* Bias Voltage
+						     * Generator Enable */
+#define AD7793_CONF_BO_EN	(1 << 13) /* Burnout Current Enable */
+#define AD7793_CONF_UNIPOLAR	(1 << 12) /* Unipolar/Bipolar Enable */
+#define AD7793_CONF_BOOST	(1 << 11) /* Boost Enable */
+#define AD7793_CONF_GAIN(x)	(((x) & 0x7) << 8) /* Gain Select */
+#define AD7793_CONF_REFSEL(x)	((x) << 6) /* INT/EXT Reference Select */
+#define AD7793_CONF_BUF		(1 << 4) /* Buffered Mode Enable */
+#define AD7793_CONF_CHAN(x)	((x) & 0xf) /* Channel select */
+#define AD7793_CONF_CHAN_MASK	0xf /* Channel select mask */
+
+#define AD7793_CH_AIN1P_AIN1M	0 /* AIN1(+) - AIN1(-) */
+#define AD7793_CH_AIN2P_AIN2M	1 /* AIN2(+) - AIN2(-) */
+#define AD7793_CH_AIN3P_AIN3M	2 /* AIN3(+) - AIN3(-) */
+#define AD7793_CH_AIN1M_AIN1M	3 /* AIN1(-) - AIN1(-) */
+#define AD7793_CH_TEMP		6 /* Temp Sensor */
+#define AD7793_CH_AVDD_MONITOR	7 /* AVDD Monitor */
+
+#define AD7795_CH_AIN4P_AIN4M	4 /* AIN4(+) - AIN4(-) */
+#define AD7795_CH_AIN5P_AIN5M	5 /* AIN5(+) - AIN5(-) */
+#define AD7795_CH_AIN6P_AIN6M	6 /* AIN6(+) - AIN6(-) */
+#define AD7795_CH_AIN1M_AIN1M	8 /* AIN1(-) - AIN1(-) */
+
+/* ID Register Bit Designations (AD7793_REG_ID) */
+#define AD7792_ID		0xA
+#define AD7793_ID		0xB
+#define AD7795_ID		0xF
+#define AD7793_ID_MASK		0xF
+
+/* IO (Excitation Current Sources) Register Bit Designations (AD7793_REG_IO) */
+#define AD7793_IO_IEXC1_IOUT1_IEXC2_IOUT2	0 /* IEXC1 connect to IOUT1,
+						   * IEXC2 connect to IOUT2 */
+#define AD7793_IO_IEXC1_IOUT2_IEXC2_IOUT1	1 /* IEXC1 connect to IOUT2,
+						   * IEXC2 connect to IOUT1 */
+#define AD7793_IO_IEXC1_IEXC2_IOUT1		2 /* Both current sources
+						   * IEXC1,2 connect to IOUT1 */
+#define AD7793_IO_IEXC1_IEXC2_IOUT2		3 /* Both current sources
+						   * IEXC1,2 connect to IOUT2 */
+
+#define AD7793_IO_IXCEN_10uA	(1 << 0) /* Excitation Current 10uA */
+#define AD7793_IO_IXCEN_210uA	(2 << 0) /* Excitation Current 210uA */
+#define AD7793_IO_IXCEN_1mA	(3 << 0) /* Excitation Current 1mA */
+
 /* NOTE:
  * The AD7792/AD7793 features a dual use data out ready DOUT/RDY output.
  * In order to avoid contentions on the SPI bus, it's therefore necessary
diff --git a/drivers/staging/iio/adc/ad7793.h b/drivers/staging/iio/adc/ad7793.h
index 7f6acac..0e455de 100644
--- a/drivers/staging/iio/adc/ad7793.h
+++ b/drivers/staging/iio/adc/ad7793.h
@@ -12,99 +12,6 @@
  * TODO: struct ad7793_platform_data needs to go into include/linux/iio
  */
 
-/* Registers */
-#define AD7793_REG_COMM		0 /* Communications Register (WO, 8-bit) */
-#define AD7793_REG_STAT		0 /* Status Register	     (RO, 8-bit) */
-#define AD7793_REG_MODE		1 /* Mode Register	     (RW, 16-bit */
-#define AD7793_REG_CONF		2 /* Configuration Register  (RW, 16-bit) */
-#define AD7793_REG_DATA		3 /* Data Register	     (RO, 16-/24-bit) */
-#define AD7793_REG_ID		4 /* ID Register	     (RO, 8-bit) */
-#define AD7793_REG_IO		5 /* IO Register	     (RO, 8-bit) */
-#define AD7793_REG_OFFSET	6 /* Offset Register	     (RW, 16-bit
-				   * (AD7792)/24-bit (AD7793)) */
-#define AD7793_REG_FULLSALE	7 /* Full-Scale Register
-				   * (RW, 16-bit (AD7792)/24-bit (AD7793)) */
-
-/* Communications Register Bit Designations (AD7793_REG_COMM) */
-#define AD7793_COMM_WEN		(1 << 7) /* Write Enable */
-#define AD7793_COMM_WRITE	(0 << 6) /* Write Operation */
-#define AD7793_COMM_READ	(1 << 6) /* Read Operation */
-#define AD7793_COMM_ADDR(x)	(((x) & 0x7) << 3) /* Register Address */
-#define AD7793_COMM_CREAD	(1 << 2) /* Continuous Read of Data Register */
-
-/* Status Register Bit Designations (AD7793_REG_STAT) */
-#define AD7793_STAT_RDY		(1 << 7) /* Ready */
-#define AD7793_STAT_ERR		(1 << 6) /* Error (Overrange, Underrange) */
-#define AD7793_STAT_CH3		(1 << 2) /* Channel 3 */
-#define AD7793_STAT_CH2		(1 << 1) /* Channel 2 */
-#define AD7793_STAT_CH1		(1 << 0) /* Channel 1 */
-
-/* Mode Register Bit Designations (AD7793_REG_MODE) */
-#define AD7793_MODE_SEL(x)	(((x) & 0x7) << 13) /* Operation Mode Select */
-#define AD7793_MODE_SEL_MASK	(0x7 << 13) /* Operation Mode Select mask */
-#define AD7793_MODE_CLKSRC(x)	(((x) & 0x3) << 6) /* ADC Clock Source Select */
-#define AD7793_MODE_RATE(x)	((x) & 0xF) /* Filter Update Rate Select */
-
-#define AD7793_MODE_CONT		0 /* Continuous Conversion Mode */
-#define AD7793_MODE_SINGLE		1 /* Single Conversion Mode */
-#define AD7793_MODE_IDLE		2 /* Idle Mode */
-#define AD7793_MODE_PWRDN		3 /* Power-Down Mode */
-#define AD7793_MODE_CAL_INT_ZERO	4 /* Internal Zero-Scale Calibration */
-#define AD7793_MODE_CAL_INT_FULL	5 /* Internal Full-Scale Calibration */
-#define AD7793_MODE_CAL_SYS_ZERO	6 /* System Zero-Scale Calibration */
-#define AD7793_MODE_CAL_SYS_FULL	7 /* System Full-Scale Calibration */
-
-#define AD7793_CLK_INT		0 /* Internal 64 kHz Clock not
-				   * available at the CLK pin */
-#define AD7793_CLK_INT_CO	1 /* Internal 64 kHz Clock available
-				   * at the CLK pin */
-#define AD7793_CLK_EXT		2 /* External 64 kHz Clock */
-#define AD7793_CLK_EXT_DIV2	3 /* External Clock divided by 2 */
-
-/* Configuration Register Bit Designations (AD7793_REG_CONF) */
-#define AD7793_CONF_VBIAS(x)	(((x) & 0x3) << 14) /* Bias Voltage
-						     * Generator Enable */
-#define AD7793_CONF_BO_EN	(1 << 13) /* Burnout Current Enable */
-#define AD7793_CONF_UNIPOLAR	(1 << 12) /* Unipolar/Bipolar Enable */
-#define AD7793_CONF_BOOST	(1 << 11) /* Boost Enable */
-#define AD7793_CONF_GAIN(x)	(((x) & 0x7) << 8) /* Gain Select */
-#define AD7793_CONF_REFSEL(x)	((x) << 6) /* INT/EXT Reference Select */
-#define AD7793_CONF_BUF		(1 << 4) /* Buffered Mode Enable */
-#define AD7793_CONF_CHAN(x)	((x) & 0xf) /* Channel select */
-#define AD7793_CONF_CHAN_MASK	0xf /* Channel select mask */
-
-#define AD7793_CH_AIN1P_AIN1M	0 /* AIN1(+) - AIN1(-) */
-#define AD7793_CH_AIN2P_AIN2M	1 /* AIN2(+) - AIN2(-) */
-#define AD7793_CH_AIN3P_AIN3M	2 /* AIN3(+) - AIN3(-) */
-#define AD7793_CH_AIN1M_AIN1M	3 /* AIN1(-) - AIN1(-) */
-#define AD7793_CH_TEMP		6 /* Temp Sensor */
-#define AD7793_CH_AVDD_MONITOR	7 /* AVDD Monitor */
-
-#define AD7795_CH_AIN4P_AIN4M	4 /* AIN4(+) - AIN4(-) */
-#define AD7795_CH_AIN5P_AIN5M	5 /* AIN5(+) - AIN5(-) */
-#define AD7795_CH_AIN6P_AIN6M	6 /* AIN6(+) - AIN6(-) */
-#define AD7795_CH_AIN1M_AIN1M	8 /* AIN1(-) - AIN1(-) */
-
-/* ID Register Bit Designations (AD7793_REG_ID) */
-#define AD7792_ID		0xA
-#define AD7793_ID		0xB
-#define AD7795_ID		0xF
-#define AD7793_ID_MASK		0xF
-
-/* IO (Excitation Current Sources) Register Bit Designations (AD7793_REG_IO) */
-#define AD7793_IO_IEXC1_IOUT1_IEXC2_IOUT2	0 /* IEXC1 connect to IOUT1,
-						   * IEXC2 connect to IOUT2 */
-#define AD7793_IO_IEXC1_IOUT2_IEXC2_IOUT1	1 /* IEXC1 connect to IOUT2,
-						   * IEXC2 connect to IOUT1 */
-#define AD7793_IO_IEXC1_IEXC2_IOUT1		2 /* Both current sources
-						   * IEXC1,2 connect to IOUT1 */
-#define AD7793_IO_IEXC1_IEXC2_IOUT2		3 /* Both current sources
-						   * IEXC1,2 connect to IOUT2 */
-
-#define AD7793_IO_IXCEN_10uA	(1 << 0) /* Excitation Current 10uA */
-#define AD7793_IO_IXCEN_210uA	(2 << 0) /* Excitation Current 210uA */
-#define AD7793_IO_IXCEN_1mA	(3 << 0) /* Excitation Current 1mA */
-
 /**
  * enum ad7793_clock_source - AD7793 clock source selection
  * @AD7793_CLK_SRC_INT: Internal 64 kHz clock, not available at the CLK pin.
-- 
1.8.0

[PATCH 08/11] staging:iio:ad7793: Implement stricter id checking

[Lars-Peter Clausen]

Instead of checking whether the id of the current device matches the id of any
device supported by the driver, check whether it matches the id of the device
which the driver was instantiated for. This makes sure that the driver is not
accidentally instantiated for the wrong device.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/staging/iio/adc/ad7793.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/staging/iio/adc/ad7793.c
index cbe8a02..0bbfdf3 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/staging/iio/adc/ad7793.c
@@ -102,8 +102,10 @@
 #define AD7795_CH_AIN1M_AIN1M	8 /* AIN1(-) - AIN1(-) */
 
 /* ID Register Bit Designations (AD7793_REG_ID) */
+#define AD7785_ID		0xB
 #define AD7792_ID		0xA
 #define AD7793_ID		0xB
+#define AD7794_ID		0xF
 #define AD7795_ID		0xF
 #define AD7793_ID_MASK		0xF
 
@@ -130,6 +132,7 @@
  */
 
 struct ad7793_chip_info {
+	unsigned int id;
 	const struct iio_chan_spec *channels;
 	unsigned int num_channels;
 };
@@ -231,7 +234,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 
 	id &= AD7793_ID_MASK;
 
-	if (!((id == AD7792_ID) || (id == AD7793_ID) || (id == AD7795_ID))) {
+	if (id != st->chip_info->id) {
 		dev_err(&st->sd.spi->dev, "device ID query failed\n");
 		goto out;
 	}
@@ -531,22 +534,27 @@ static DECLARE_AD7795_CHANNELS(ad7795, 24, 32);
 
 static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
 	[ID_AD7785] = {
+		.id = AD7785_ID,
 		.channels = ad7785_channels,
 		.num_channels = ARRAY_SIZE(ad7785_channels),
 	},
 	[ID_AD7792] = {
+		.id = AD7792_ID,
 		.channels = ad7792_channels,
 		.num_channels = ARRAY_SIZE(ad7792_channels),
 	},
 	[ID_AD7793] = {
+		.id = AD7793_ID,
 		.channels = ad7793_channels,
 		.num_channels = ARRAY_SIZE(ad7793_channels),
 	},
 	[ID_AD7794] = {
+		.id = AD7794_ID,
 		.channels = ad7794_channels,
 		.num_channels = ARRAY_SIZE(ad7794_channels),
 	},
 	[ID_AD7795] = {
+		.id = AD7795_ID,
 		.channels = ad7795_channels,
 		.num_channels = ARRAY_SIZE(ad7795_channels),
 	},
-- 
1.8.0

[PATCH 09/11] staging:iio: Move ad7793 driver out of staging

[Lars-Peter Clausen]

The driver does not expose any custom API to userspace and none of the standard
static code checker tools report any issues, so move it out of staging.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/adc/Kconfig                                      | 12 ++++++++++++
 drivers/iio/adc/Makefile                                     |  1 +
 drivers/{staging => }/iio/adc/ad7793.c                       |  3 +--
 drivers/staging/iio/adc/Kconfig                              | 12 ------------
 drivers/staging/iio/adc/Makefile                             |  1 -
 .../staging/iio/adc => include/linux/platform_data}/ad7793.h |  8 ++------
 6 files changed, 16 insertions(+), 21 deletions(-)
 rename drivers/{staging => }/iio/adc/ad7793.c (99%)
 rename {drivers/staging/iio/adc => include/linux/platform_data}/ad7793.h (96%)

diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index cd5eed6..408557b 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -42,6 +42,18 @@ config AD7791
 	  To compile this driver as a module, choose M here: the module will be
 	  called ad7791.
 
+config AD7793
+	tristate "Analog Devices AD7793 and similar ADCs driver"
+	depends on SPI
+	select AD_SIGMA_DELTA
+	help
+	  Say yes here to build support for Analog Devices AD7785, AD7792, AD7793,
+	  AD7794 and AD7795 SPI analog to digital converters (ADC).
+	  If unsure, say N (but it's safe to say "Y").
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called AD7793.
+
 config AD7476
 	tristate "Analog Devices AD7476 and similar 1-channel ADCs driver"
 	depends on SPI
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index 3256dc6..78202d9 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -7,6 +7,7 @@ obj-$(CONFIG_AD7266) += ad7266.o
 obj-$(CONFIG_AD7298) += ad7298.o
 obj-$(CONFIG_AD7476) += ad7476.o
 obj-$(CONFIG_AD7791) += ad7791.o
+obj-$(CONFIG_AD7793) += ad7793.o
 obj-$(CONFIG_AD7887) += ad7887.o
 obj-$(CONFIG_AT91_ADC) += at91_adc.o
 obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o
diff --git a/drivers/staging/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
similarity index 99%
rename from drivers/staging/iio/adc/ad7793.c
rename to drivers/iio/adc/ad7793.c
index 0bbfdf3..8bcda5d 100644
--- a/drivers/staging/iio/adc/ad7793.c
+++ b/drivers/iio/adc/ad7793.c
@@ -25,8 +25,7 @@
 #include <linux/iio/trigger_consumer.h>
 #include <linux/iio/triggered_buffer.h>
 #include <linux/iio/adc/ad_sigma_delta.h>
-
-#include "ad7793.h"
+#include <linux/platform_data/ad7793.h>
 
 /* Registers */
 #define AD7793_REG_COMM		0 /* Communications Register (WO, 8-bit) */
diff --git a/drivers/staging/iio/adc/Kconfig b/drivers/staging/iio/adc/Kconfig
index dc8582b..fb8c239 100644
--- a/drivers/staging/iio/adc/Kconfig
+++ b/drivers/staging/iio/adc/Kconfig
@@ -70,18 +70,6 @@ config AD7780
 	  To compile this driver as a module, choose M here: the
 	  module will be called ad7780.
 
-config AD7793
-	tristate "Analog Devices AD7793 and similar ADCs driver"
-	depends on SPI
-	select AD_SIGMA_DELTA
-	help
-	  Say yes here to build support for Analog Devices AD7785, AD7792, AD7793,
-	  AD7794 and AD7795 SPI analog to digital converters (ADC).
-	  If unsure, say N (but it's safe to say "Y").
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called AD7793.
-
 config AD7816
 	tristate "Analog Devices AD7816/7/8 temperature sensor and ADC driver"
 	depends on SPI
diff --git a/drivers/staging/iio/adc/Makefile b/drivers/staging/iio/adc/Makefile
index 7281451..d285596 100644
--- a/drivers/staging/iio/adc/Makefile
+++ b/drivers/staging/iio/adc/Makefile
@@ -14,7 +14,6 @@ obj-$(CONFIG_AD799X) += ad799x.o
 
 obj-$(CONFIG_AD7291) += ad7291.o
 obj-$(CONFIG_AD7780) += ad7780.o
-obj-$(CONFIG_AD7793) += ad7793.o
 obj-$(CONFIG_AD7816) += ad7816.o
 obj-$(CONFIG_AD7192) += ad7192.o
 obj-$(CONFIG_ADT7410) += adt7410.o
diff --git a/drivers/staging/iio/adc/ad7793.h b/include/linux/platform_data/ad7793.h
similarity index 96%
rename from drivers/staging/iio/adc/ad7793.h
rename to include/linux/platform_data/ad7793.h
index 0e455de..7ea6751 100644
--- a/drivers/staging/iio/adc/ad7793.h
+++ b/include/linux/platform_data/ad7793.h
@@ -5,12 +5,8 @@
  *
  * Licensed under the GPL-2.
  */
-#ifndef IIO_ADC_AD7793_H_
-#define IIO_ADC_AD7793_H_
-
-/*
- * TODO: struct ad7793_platform_data needs to go into include/linux/iio
- */
+#ifndef __LINUX_PLATFORM_DATA_AD7793_H__
+#define __LINUX_PLATFORM_DATA_AD7793_H__
 
 /**
  * enum ad7793_clock_source - AD7793 clock source selection
-- 
1.8.0

[PATCH 10/11] iio:ad7793: Add support for the ad7798 and ad7799

[Lars-Peter Clausen]

The ad7798 and ad7799 are similar to the ad7792 and ad7793 but are missing some
features like the temperature sensor, being able to use an external clocksource
and a few other things. This patch adds a new 'flags' fields to the chip_info
struct which allows to specify which features a certain chip variant supports.
The setup code will then ignore any platform data fields which are related to
non supported features.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/adc/ad7793.c | 116 +++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 102 insertions(+), 14 deletions(-)

diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
index 8bcda5d..4a7ee0b 100644
--- a/drivers/iio/adc/ad7793.c
+++ b/drivers/iio/adc/ad7793.c
@@ -106,6 +106,8 @@
 #define AD7793_ID		0xB
 #define AD7794_ID		0xF
 #define AD7795_ID		0xF
+#define AD7798_ID		0x8
+#define AD7799_ID		0x9
 #define AD7793_ID_MASK		0xF
 
 /* IO (Excitation Current Sources) Register Bit Designations (AD7793_REG_IO) */
@@ -130,10 +132,16 @@
  * The DOUT/RDY output must also be wired to an interrupt capable GPIO.
  */
 
+#define AD7793_FLAG_HAS_CLKSEL		BIT(0)
+#define AD7793_FLAG_HAS_REFSEL		BIT(1)
+#define AD7793_FLAG_HAS_VBIAS		BIT(2)
+#define AD7793_HAS_EXITATION_CURRENT	BIT(3)
+
 struct ad7793_chip_info {
 	unsigned int id;
 	const struct iio_chan_spec *channels;
 	unsigned int num_channels;
+	unsigned int flags;
 };
 
 struct ad7793_state {
@@ -154,6 +162,8 @@ enum ad7793_supported_device_ids {
 	ID_AD7793,
 	ID_AD7794,
 	ID_AD7795,
+	ID_AD7798,
+	ID_AD7799,
 };
 
 static struct ad7793_state *ad_sigma_delta_to_ad7793(struct ad_sigma_delta *sd)
@@ -205,6 +215,34 @@ static int ad7793_calibrate_all(struct ad7793_state *st)
 				   ARRAY_SIZE(ad7793_calib_arr));
 }
 
+static int ad7793_check_platform_data(struct ad7793_state *st,
+	const struct ad7793_platform_data *pdata)
+{
+	if ((pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT1 ||
+		pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT2) &&
+		((pdata->exitation_current != AD7793_IX_10uA) &&
+		(pdata->exitation_current != AD7793_IX_210uA)))
+		return -EINVAL;
+
+	if (!(st->chip_info->flags & AD7793_FLAG_HAS_CLKSEL) &&
+		pdata->clock_src != AD7793_CLK_SRC_INT)
+		return -EINVAL;
+
+	if (!(st->chip_info->flags & AD7793_FLAG_HAS_REFSEL) &&
+		pdata->refsel != AD7793_REFSEL_REFIN1)
+		return -EINVAL;
+
+	if (!(st->chip_info->flags & AD7793_FLAG_HAS_VBIAS) &&
+		pdata->bias_voltage != AD7793_BIAS_VOLTAGE_DISABLED)
+		return -EINVAL;
+
+	if (!(st->chip_info->flags & AD7793_HAS_EXITATION_CURRENT) &&
+		pdata->exitation_current != AD7793_IX_DISABLED)
+		return -EINVAL;
+
+	return 0;
+}
+
 static int ad7793_setup(struct iio_dev *indio_dev,
 	const struct ad7793_platform_data *pdata,
 	unsigned int vref_mv)
@@ -214,11 +252,9 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 	unsigned long long scale_uv;
 	u32 id;
 
-	if ((pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT1 ||
-		pdata->current_source_direction == AD7793_IEXEC1_IEXEC2_IOUT2) &&
-		((pdata->exitation_current != AD7793_IX_10uA) &&
-		(pdata->exitation_current != AD7793_IX_210uA)))
-		return -EINVAL;
+	ret = ad7793_check_platform_data(st, pdata);
+	if (ret)
+		return ret;
 
 	/* reset the serial interface */
 	ret = spi_write(st->sd.spi, (u8 *)&ret, sizeof(ret));
@@ -239,12 +275,18 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 	}
 
 	st->mode = AD7793_MODE_RATE(1);
-	st->mode |= AD7793_MODE_CLKSRC(pdata->clock_src);
-	st->conf = AD7793_CONF_REFSEL(pdata->refsel);
-	st->conf |= AD7793_CONF_VBIAS(pdata->bias_voltage);
+	st->conf = 0;
+
+	if (st->chip_info->flags & AD7793_FLAG_HAS_CLKSEL)
+		st->mode |= AD7793_MODE_CLKSRC(pdata->clock_src);
+	if (st->chip_info->flags & AD7793_FLAG_HAS_REFSEL)
+		st->conf |= AD7793_CONF_REFSEL(pdata->refsel);
+	if (st->chip_info->flags & AD7793_FLAG_HAS_VBIAS)
+		st->conf |= AD7793_CONF_VBIAS(pdata->bias_voltage);
 	if (pdata->buffered)
 		st->conf |= AD7793_CONF_BUF;
-	if (pdata->boost_enable)
+	if (pdata->boost_enable &&
+		(st->chip_info->flags & AD7793_FLAG_HAS_VBIAS))
 		st->conf |= AD7793_CONF_BOOST;
 	if (pdata->burnout_current)
 		st->conf |= AD7793_CONF_BO_EN;
@@ -259,11 +301,13 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 	if (ret)
 		goto out;
 
-	ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO, 1,
-				   pdata->exitation_current |
-			       (pdata->current_source_direction << 2));
-	if (ret)
-		goto out;
+	if (st->chip_info->flags & AD7793_HAS_EXITATION_CURRENT) {
+		ret = ad_sd_write_reg(&st->sd, AD7793_REG_IO, 1,
+				pdata->exitation_current |
+				(pdata->current_source_direction << 2));
+		if (ret)
+			goto out;
+	}
 
 	ret = ad7793_calibrate_all(st);
 	if (ret)
@@ -525,37 +569,79 @@ const struct iio_chan_spec _name##_channels[] = { \
 	IIO_CHAN_SOFT_TIMESTAMP(9), \
 }
 
+#define DECLARE_AD7799_CHANNELS(_name, _b, _sb) \
+const struct iio_chan_spec _name##_channels[] = { \
+	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \
+	AD_SD_DIFF_CHANNEL(1, 1, 1, AD7793_CH_AIN2P_AIN2M, (_b), (_sb), 0), \
+	AD_SD_DIFF_CHANNEL(2, 2, 2, AD7793_CH_AIN3P_AIN3M, (_b), (_sb), 0), \
+	AD_SD_SHORTED_CHANNEL(3, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \
+	AD_SD_SUPPLY_CHANNEL(4, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \
+	IIO_CHAN_SOFT_TIMESTAMP(5), \
+}
+
 static DECLARE_AD7793_CHANNELS(ad7785, 20, 32, 4);
 static DECLARE_AD7793_CHANNELS(ad7792, 16, 32, 0);
 static DECLARE_AD7793_CHANNELS(ad7793, 24, 32, 0);
 static DECLARE_AD7795_CHANNELS(ad7794, 16, 32);
 static DECLARE_AD7795_CHANNELS(ad7795, 24, 32);
+static DECLARE_AD7799_CHANNELS(ad7798, 16, 16);
+static DECLARE_AD7799_CHANNELS(ad7799, 24, 32);
 
 static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
 	[ID_AD7785] = {
 		.id = AD7785_ID,
 		.channels = ad7785_channels,
 		.num_channels = ARRAY_SIZE(ad7785_channels),
+		.flags = AD7793_FLAG_HAS_CLKSEL |
+			AD7793_FLAG_HAS_REFSEL |
+			AD7793_FLAG_HAS_VBIAS |
+			AD7793_HAS_EXITATION_CURRENT,
 	},
 	[ID_AD7792] = {
 		.id = AD7792_ID,
 		.channels = ad7792_channels,
 		.num_channels = ARRAY_SIZE(ad7792_channels),
+		.flags = AD7793_FLAG_HAS_CLKSEL |
+			AD7793_FLAG_HAS_REFSEL |
+			AD7793_FLAG_HAS_VBIAS |
+			AD7793_HAS_EXITATION_CURRENT,
 	},
 	[ID_AD7793] = {
 		.id = AD7793_ID,
 		.channels = ad7793_channels,
 		.num_channels = ARRAY_SIZE(ad7793_channels),
+		.flags = AD7793_FLAG_HAS_CLKSEL |
+			AD7793_FLAG_HAS_REFSEL |
+			AD7793_FLAG_HAS_VBIAS |
+			AD7793_HAS_EXITATION_CURRENT,
 	},
 	[ID_AD7794] = {
 		.id = AD7794_ID,
 		.channels = ad7794_channels,
 		.num_channels = ARRAY_SIZE(ad7794_channels),
+		.flags = AD7793_FLAG_HAS_CLKSEL |
+			AD7793_FLAG_HAS_REFSEL |
+			AD7793_FLAG_HAS_VBIAS |
+			AD7793_HAS_EXITATION_CURRENT,
 	},
 	[ID_AD7795] = {
 		.id = AD7795_ID,
 		.channels = ad7795_channels,
 		.num_channels = ARRAY_SIZE(ad7795_channels),
+		.flags = AD7793_FLAG_HAS_CLKSEL |
+			AD7793_FLAG_HAS_REFSEL |
+			AD7793_FLAG_HAS_VBIAS |
+			AD7793_HAS_EXITATION_CURRENT,
+	},
+	[ID_AD7798] = {
+		.id = AD7798_ID,
+		.channels = ad7798_channels,
+		.num_channels = ARRAY_SIZE(ad7798_channels),
+	},
+	[ID_AD7799] = {
+		.id = AD7799_ID,
+		.channels = ad7799_channels,
+		.num_channels = ARRAY_SIZE(ad7799_channels),
 	},
 };
 
@@ -671,6 +757,8 @@ static const struct spi_device_id ad7793_id[] = {
 	{"ad7793", ID_AD7793},
 	{"ad7794", ID_AD7794},
 	{"ad7795", ID_AD7795},
+	{"ad7798", ID_AD7798},
+	{"ad7799", ID_AD7799},
 	{}
 };
 MODULE_DEVICE_TABLE(spi, ad7793_id);
-- 
1.8.0

[PATCH 11/11] iio:ad7793: Add support for the ad7796 and ad7797

[Lars-Peter Clausen]

The ad7796 and ad7797 are similar to the ad7792 and ad7793 but only have a
single differential input instead of two. Also some other features are missing
like the programmable gain amplifier and also not all sampling frequencies
supported by the ad7792/ad7793 are supported by the ad7796/ad7797. This patch
adds new feature flags for the features not present in the ad7796/ad7797. The
patch also adds a struct iio_info field to the chip_info struct, this becomes
necessary since the ad7796/ad7797 needs a special set of sysfs attributes.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 drivers/iio/adc/ad7793.c | 121 ++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 109 insertions(+), 12 deletions(-)

diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
index 4a7ee0b..65489b0 100644
--- a/drivers/iio/adc/ad7793.c
+++ b/drivers/iio/adc/ad7793.c
@@ -106,6 +106,8 @@
 #define AD7793_ID		0xB
 #define AD7794_ID		0xF
 #define AD7795_ID		0xF
+#define AD7796_ID		0xA
+#define AD7797_ID		0xB
 #define AD7798_ID		0x8
 #define AD7799_ID		0x9
 #define AD7793_ID_MASK		0xF
@@ -136,12 +138,17 @@
 #define AD7793_FLAG_HAS_REFSEL		BIT(1)
 #define AD7793_FLAG_HAS_VBIAS		BIT(2)
 #define AD7793_HAS_EXITATION_CURRENT	BIT(3)
+#define AD7793_FLAG_HAS_GAIN		BIT(4)
+#define AD7793_FLAG_HAS_BUFFER		BIT(5)
 
 struct ad7793_chip_info {
 	unsigned int id;
 	const struct iio_chan_spec *channels;
 	unsigned int num_channels;
 	unsigned int flags;
+
+	const struct iio_info *iio_info;
+	const u16 *sample_freq_avail;
 };
 
 struct ad7793_state {
@@ -162,6 +169,8 @@ enum ad7793_supported_device_ids {
 	ID_AD7793,
 	ID_AD7794,
 	ID_AD7795,
+	ID_AD7796,
+	ID_AD7797,
 	ID_AD7798,
 	ID_AD7799,
 };
@@ -283,7 +292,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 		st->conf |= AD7793_CONF_REFSEL(pdata->refsel);
 	if (st->chip_info->flags & AD7793_FLAG_HAS_VBIAS)
 		st->conf |= AD7793_CONF_VBIAS(pdata->bias_voltage);
-	if (pdata->buffered)
+	if (pdata->buffered || !(st->chip_info->flags & AD7793_FLAG_HAS_BUFFER))
 		st->conf |= AD7793_CONF_BUF;
 	if (pdata->boost_enable &&
 		(st->chip_info->flags & AD7793_FLAG_HAS_VBIAS))
@@ -293,6 +302,9 @@ static int ad7793_setup(struct iio_dev *indio_dev,
 	if (pdata->unipolar)
 		st->conf |= AD7793_CONF_UNIPOLAR;
 
+	if (!(st->chip_info->flags & AD7793_FLAG_HAS_GAIN))
+		st->conf |= AD7793_CONF_GAIN(7);
+
 	ret = ad7793_set_mode(&st->sd, AD_SD_MODE_IDLE);
 	if (ret)
 		goto out;
@@ -330,8 +342,11 @@ out:
 	return ret;
 }
 
-static const u16 sample_freq_avail[16] = {0, 470, 242, 123, 62, 50, 39, 33, 19,
-					  17, 16, 12, 10, 8, 6, 4};
+static const u16 ad7793_sample_freq_avail[16] = {0, 470, 242, 123, 62, 50, 39,
+					33, 19, 17, 16, 12, 10, 8, 6, 4};
+
+static const u16 ad7797_sample_freq_avail[16] = {0, 0, 0, 123, 62, 50, 0,
+					33, 0, 17, 16, 12, 10, 8, 6, 4};
 
 static ssize_t ad7793_read_frequency(struct device *dev,
 		struct device_attribute *attr,
@@ -341,7 +356,7 @@ static ssize_t ad7793_read_frequency(struct device *dev,
 	struct ad7793_state *st = iio_priv(indio_dev);
 
 	return sprintf(buf, "%d\n",
-		       sample_freq_avail[AD7793_MODE_RATE(st->mode)]);
+	       st->chip_info->sample_freq_avail[AD7793_MODE_RATE(st->mode)]);
 }
 
 static ssize_t ad7793_write_frequency(struct device *dev,
@@ -365,10 +380,13 @@ static ssize_t ad7793_write_frequency(struct device *dev,
 	if (ret)
 		return ret;
 
+	if (lval == 0)
+		return -EINVAL;
+
 	ret = -EINVAL;
 
-	for (i = 0; i < ARRAY_SIZE(sample_freq_avail); i++)
-		if (lval == sample_freq_avail[i]) {
+	for (i = 0; i < 16; i++)
+		if (lval == st->chip_info->sample_freq_avail[i]) {
 			mutex_lock(&indio_dev->mlock);
 			st->mode &= ~AD7793_MODE_RATE(-1);
 			st->mode |= AD7793_MODE_RATE(i);
@@ -388,6 +406,9 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
 static IIO_CONST_ATTR_SAMP_FREQ_AVAIL(
 	"470 242 123 62 50 39 33 19 17 16 12 10 8 6 4");
 
+static IIO_CONST_ATTR_NAMED(sampling_frequency_available_ad7797,
+	sampling_frequency_available, "123 62 50 33 17 16 12 10 8 6 4");
+
 static ssize_t ad7793_show_scale_available(struct device *dev,
 			struct device_attribute *attr, char *buf)
 {
@@ -419,6 +440,16 @@ static const struct attribute_group ad7793_attribute_group = {
 	.attrs = ad7793_attributes,
 };
 
+static struct attribute *ad7797_attributes[] = {
+	&iio_dev_attr_sampling_frequency.dev_attr.attr,
+	&iio_const_attr_sampling_frequency_available_ad7797.dev_attr.attr,
+	NULL
+};
+
+static const struct attribute_group ad7797_attribute_group = {
+	.attrs = ad7797_attributes,
+};
+
 static int ad7793_read_raw(struct iio_dev *indio_dev,
 			   struct iio_chan_spec const *chan,
 			   int *val,
@@ -544,6 +575,15 @@ static const struct iio_info ad7793_info = {
 	.driver_module = THIS_MODULE,
 };
 
+static const struct iio_info ad7797_info = {
+	.read_raw = &ad7793_read_raw,
+	.write_raw = &ad7793_write_raw,
+	.write_raw_get_fmt = &ad7793_write_raw_get_fmt,
+	.attrs = &ad7793_attribute_group,
+	.validate_trigger = ad_sd_validate_trigger,
+	.driver_module = THIS_MODULE,
+};
+
 #define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \
 const struct iio_chan_spec _name##_channels[] = { \
 	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), (_s)), \
@@ -569,6 +609,15 @@ const struct iio_chan_spec _name##_channels[] = { \
 	IIO_CHAN_SOFT_TIMESTAMP(9), \
 }
 
+#define DECLARE_AD7797_CHANNELS(_name, _b, _sb) \
+const struct iio_chan_spec _name##_channels[] = { \
+	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \
+	AD_SD_SHORTED_CHANNEL(1, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \
+	AD_SD_TEMP_CHANNEL(2, AD7793_CH_TEMP, (_b), (_sb), 0), \
+	AD_SD_SUPPLY_CHANNEL(3, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \
+	IIO_CHAN_SOFT_TIMESTAMP(4), \
+}
+
 #define DECLARE_AD7799_CHANNELS(_name, _b, _sb) \
 const struct iio_chan_spec _name##_channels[] = { \
 	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \
@@ -584,6 +633,8 @@ static DECLARE_AD7793_CHANNELS(ad7792, 16, 32, 0);
 static DECLARE_AD7793_CHANNELS(ad7793, 24, 32, 0);
 static DECLARE_AD7795_CHANNELS(ad7794, 16, 32);
 static DECLARE_AD7795_CHANNELS(ad7795, 24, 32);
+static DECLARE_AD7797_CHANNELS(ad7796, 16, 16);
+static DECLARE_AD7797_CHANNELS(ad7797, 24, 32);
 static DECLARE_AD7799_CHANNELS(ad7798, 16, 16);
 static DECLARE_AD7799_CHANNELS(ad7799, 24, 32);
 
@@ -592,56 +643,100 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
 		.id = AD7785_ID,
 		.channels = ad7785_channels,
 		.num_channels = ARRAY_SIZE(ad7785_channels),
+		.iio_info = &ad7793_info,
+		.sample_freq_avail = ad7793_sample_freq_avail,
 		.flags = AD7793_FLAG_HAS_CLKSEL |
 			AD7793_FLAG_HAS_REFSEL |
 			AD7793_FLAG_HAS_VBIAS |
-			AD7793_HAS_EXITATION_CURRENT,
+			AD7793_HAS_EXITATION_CURRENT |
+			AD7793_FLAG_HAS_GAIN |
+			AD7793_FLAG_HAS_BUFFER,
 	},
 	[ID_AD7792] = {
 		.id = AD7792_ID,
 		.channels = ad7792_channels,
 		.num_channels = ARRAY_SIZE(ad7792_channels),
+		.iio_info = &ad7793_info,
+		.sample_freq_avail = ad7793_sample_freq_avail,
 		.flags = AD7793_FLAG_HAS_CLKSEL |
 			AD7793_FLAG_HAS_REFSEL |
 			AD7793_FLAG_HAS_VBIAS |
-			AD7793_HAS_EXITATION_CURRENT,
+			AD7793_HAS_EXITATION_CURRENT |
+			AD7793_FLAG_HAS_GAIN |
+			AD7793_FLAG_HAS_BUFFER,
 	},
 	[ID_AD7793] = {
 		.id = AD7793_ID,
 		.channels = ad7793_channels,
 		.num_channels = ARRAY_SIZE(ad7793_channels),
+		.iio_info = &ad7793_info,
+		.sample_freq_avail = ad7793_sample_freq_avail,
 		.flags = AD7793_FLAG_HAS_CLKSEL |
 			AD7793_FLAG_HAS_REFSEL |
 			AD7793_FLAG_HAS_VBIAS |
-			AD7793_HAS_EXITATION_CURRENT,
+			AD7793_HAS_EXITATION_CURRENT |
+			AD7793_FLAG_HAS_GAIN |
+			AD7793_FLAG_HAS_BUFFER,
 	},
 	[ID_AD7794] = {
 		.id = AD7794_ID,
 		.channels = ad7794_channels,
 		.num_channels = ARRAY_SIZE(ad7794_channels),
+		.iio_info = &ad7793_info,
+		.sample_freq_avail = ad7793_sample_freq_avail,
 		.flags = AD7793_FLAG_HAS_CLKSEL |
 			AD7793_FLAG_HAS_REFSEL |
 			AD7793_FLAG_HAS_VBIAS |
-			AD7793_HAS_EXITATION_CURRENT,
+			AD7793_HAS_EXITATION_CURRENT |
+			AD7793_FLAG_HAS_GAIN |
+			AD7793_FLAG_HAS_BUFFER,
 	},
 	[ID_AD7795] = {
 		.id = AD7795_ID,
 		.channels = ad7795_channels,
 		.num_channels = ARRAY_SIZE(ad7795_channels),
+		.iio_info = &ad7793_info,
+		.sample_freq_avail = ad7793_sample_freq_avail,
 		.flags = AD7793_FLAG_HAS_CLKSEL |
 			AD7793_FLAG_HAS_REFSEL |
 			AD7793_FLAG_HAS_VBIAS |
-			AD7793_HAS_EXITATION_CURRENT,
+			AD7793_HAS_EXITATION_CURRENT |
+			AD7793_FLAG_HAS_GAIN |
+			AD7793_FLAG_HAS_BUFFER,
+	},
+	[ID_AD7796] = {
+		.id = AD7796_ID,
+		.channels = ad7796_channels,
+		.num_channels = ARRAY_SIZE(ad7796_channels),
+		.iio_info = &ad7797_info,
+		.sample_freq_avail = ad7797_sample_freq_avail,
+		.flags = AD7793_FLAG_HAS_CLKSEL,
+	},
+	[ID_AD7797] = {
+		.id = AD7797_ID,
+		.channels = ad7797_channels,
+		.num_channels = ARRAY_SIZE(ad7797_channels),
+		.iio_info = &ad7797_info,
+		.sample_freq_avail = ad7797_sample_freq_avail,
+		.flags = AD7793_FLAG_HAS_CLKSEL,
 	},
 	[ID_AD7798] = {
 		.id = AD7798_ID,
 		.channels = ad7798_channels,
 		.num_channels = ARRAY_SIZE(ad7798_channels),
+		.iio_info = &ad7793_info,
+		.sample_freq_avail = ad7793_sample_freq_avail,
+		.flags = AD7793_FLAG_HAS_GAIN |
+			AD7793_FLAG_HAS_BUFFER,
 	},
 	[ID_AD7799] = {
 		.id = AD7799_ID,
 		.channels = ad7799_channels,
 		.num_channels = ARRAY_SIZE(ad7799_channels),
+		.iio_info = &ad7793_info,
+		.sample_freq_avail = ad7793_sample_freq_avail,
+		.flags = AD7793_FLAG_HAS_GAIN |
+			AD7793_FLAG_HAS_BUFFER,
 	},
 };
 
@@ -702,7 +797,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
 	indio_dev->modes = INDIO_DIRECT_MODE;
 	indio_dev->channels = st->chip_info->channels;
 	indio_dev->num_channels = st->chip_info->num_channels;
-	indio_dev->info = &ad7793_info;
+	indio_dev->info = st->chip_info->iio_info;
 
 	ret = ad_sd_setup_buffer_and_trigger(indio_dev);
 	if (ret)
@@ -757,6 +852,8 @@ static const struct spi_device_id ad7793_id[] = {
 	{"ad7793", ID_AD7793},
 	{"ad7794", ID_AD7794},
 	{"ad7795", ID_AD7795},
+	{"ad7796", ID_AD7796},
+	{"ad7797", ID_AD7797},
 	{"ad7798", ID_AD7798},
 	{"ad7799", ID_AD7799},
 	{}
-- 
1.8.0

Re: [PATCH 11/11] iio:ad7793: Add support for the ad7796 and ad7797

[Jonathan Cameron]

On 11/21/2012 04:27 PM, Lars-Peter Clausen wrote:
> The ad7796 and ad7797 are similar to the ad7792 and ad7793 but only have a
> single differential input instead of two. Also some other features are missing
> like the programmable gain amplifier and also not all sampling frequencies
> supported by the ad7792/ad7793 are supported by the ad7796/ad7797. This patch
> adds new feature flags for the features not present in the ad7796/ad7797. The
> patch also adds a struct iio_info field to the chip_info struct, this becomes
> necessary since the ad7796/ad7797 needs a special set of sysfs attributes.
> 
> Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
Nice little series, all added to togreg branch of iio.git

> ---
>  drivers/iio/adc/ad7793.c | 121 ++++++++++++++++++++++++++++++++++++++++++-----
>  1 file changed, 109 insertions(+), 12 deletions(-)
> 
> diff --git a/drivers/iio/adc/ad7793.c b/drivers/iio/adc/ad7793.c
> index 4a7ee0b..65489b0 100644
> --- a/drivers/iio/adc/ad7793.c
> +++ b/drivers/iio/adc/ad7793.c
> @@ -106,6 +106,8 @@
>  #define AD7793_ID		0xB
>  #define AD7794_ID		0xF
>  #define AD7795_ID		0xF
> +#define AD7796_ID		0xA
> +#define AD7797_ID		0xB
>  #define AD7798_ID		0x8
>  #define AD7799_ID		0x9
>  #define AD7793_ID_MASK		0xF
> @@ -136,12 +138,17 @@
>  #define AD7793_FLAG_HAS_REFSEL		BIT(1)
>  #define AD7793_FLAG_HAS_VBIAS		BIT(2)
>  #define AD7793_HAS_EXITATION_CURRENT	BIT(3)
> +#define AD7793_FLAG_HAS_GAIN		BIT(4)
> +#define AD7793_FLAG_HAS_BUFFER		BIT(5)
>  
>  struct ad7793_chip_info {
>  	unsigned int id;
>  	const struct iio_chan_spec *channels;
>  	unsigned int num_channels;
>  	unsigned int flags;
> +
> +	const struct iio_info *iio_info;
> +	const u16 *sample_freq_avail;
>  };
>  
>  struct ad7793_state {
> @@ -162,6 +169,8 @@ enum ad7793_supported_device_ids {
>  	ID_AD7793,
>  	ID_AD7794,
>  	ID_AD7795,
> +	ID_AD7796,
> +	ID_AD7797,
>  	ID_AD7798,
>  	ID_AD7799,
>  };
> @@ -283,7 +292,7 @@ static int ad7793_setup(struct iio_dev *indio_dev,
>  		st->conf |= AD7793_CONF_REFSEL(pdata->refsel);
>  	if (st->chip_info->flags & AD7793_FLAG_HAS_VBIAS)
>  		st->conf |= AD7793_CONF_VBIAS(pdata->bias_voltage);
> -	if (pdata->buffered)
> +	if (pdata->buffered || !(st->chip_info->flags & AD7793_FLAG_HAS_BUFFER))
>  		st->conf |= AD7793_CONF_BUF;
>  	if (pdata->boost_enable &&
>  		(st->chip_info->flags & AD7793_FLAG_HAS_VBIAS))
> @@ -293,6 +302,9 @@ static int ad7793_setup(struct iio_dev *indio_dev,
>  	if (pdata->unipolar)
>  		st->conf |= AD7793_CONF_UNIPOLAR;
>  
> +	if (!(st->chip_info->flags & AD7793_FLAG_HAS_GAIN))
> +		st->conf |= AD7793_CONF_GAIN(7);
> +
>  	ret = ad7793_set_mode(&st->sd, AD_SD_MODE_IDLE);
>  	if (ret)
>  		goto out;
> @@ -330,8 +342,11 @@ out:
>  	return ret;
>  }
>  
> -static const u16 sample_freq_avail[16] = {0, 470, 242, 123, 62, 50, 39, 33, 19,
> -					  17, 16, 12, 10, 8, 6, 4};
> +static const u16 ad7793_sample_freq_avail[16] = {0, 470, 242, 123, 62, 50, 39,
> +					33, 19, 17, 16, 12, 10, 8, 6, 4};
> +
> +static const u16 ad7797_sample_freq_avail[16] = {0, 0, 0, 123, 62, 50, 0,
> +					33, 0, 17, 16, 12, 10, 8, 6, 4};
>  
>  static ssize_t ad7793_read_frequency(struct device *dev,
>  		struct device_attribute *attr,
> @@ -341,7 +356,7 @@ static ssize_t ad7793_read_frequency(struct device *dev,
>  	struct ad7793_state *st = iio_priv(indio_dev);
>  
>  	return sprintf(buf, "%d\n",
> -		       sample_freq_avail[AD7793_MODE_RATE(st->mode)]);
> +	       st->chip_info->sample_freq_avail[AD7793_MODE_RATE(st->mode)]);
>  }
>  
>  static ssize_t ad7793_write_frequency(struct device *dev,
> @@ -365,10 +380,13 @@ static ssize_t ad7793_write_frequency(struct device *dev,
>  	if (ret)
>  		return ret;
>  
> +	if (lval == 0)
> +		return -EINVAL;
> +
>  	ret = -EINVAL;
>  
> -	for (i = 0; i < ARRAY_SIZE(sample_freq_avail); i++)
> -		if (lval == sample_freq_avail[i]) {
> +	for (i = 0; i < 16; i++)
> +		if (lval == st->chip_info->sample_freq_avail[i]) {
>  			mutex_lock(&indio_dev->mlock);
>  			st->mode &= ~AD7793_MODE_RATE(-1);
>  			st->mode |= AD7793_MODE_RATE(i);
> @@ -388,6 +406,9 @@ static IIO_DEV_ATTR_SAMP_FREQ(S_IWUSR | S_IRUGO,
>  static IIO_CONST_ATTR_SAMP_FREQ_AVAIL(
>  	"470 242 123 62 50 39 33 19 17 16 12 10 8 6 4");
>  
> +static IIO_CONST_ATTR_NAMED(sampling_frequency_available_ad7797,
> +	sampling_frequency_available, "123 62 50 33 17 16 12 10 8 6 4");
> +
>  static ssize_t ad7793_show_scale_available(struct device *dev,
>  			struct device_attribute *attr, char *buf)
>  {
> @@ -419,6 +440,16 @@ static const struct attribute_group ad7793_attribute_group = {
>  	.attrs = ad7793_attributes,
>  };
>  
> +static struct attribute *ad7797_attributes[] = {
> +	&iio_dev_attr_sampling_frequency.dev_attr.attr,
> +	&iio_const_attr_sampling_frequency_available_ad7797.dev_attr.attr,
> +	NULL
> +};
> +
> +static const struct attribute_group ad7797_attribute_group = {
> +	.attrs = ad7797_attributes,
> +};
> +
>  static int ad7793_read_raw(struct iio_dev *indio_dev,
>  			   struct iio_chan_spec const *chan,
>  			   int *val,
> @@ -544,6 +575,15 @@ static const struct iio_info ad7793_info = {
>  	.driver_module = THIS_MODULE,
>  };
>  
> +static const struct iio_info ad7797_info = {
> +	.read_raw = &ad7793_read_raw,
> +	.write_raw = &ad7793_write_raw,
> +	.write_raw_get_fmt = &ad7793_write_raw_get_fmt,
> +	.attrs = &ad7793_attribute_group,
> +	.validate_trigger = ad_sd_validate_trigger,
> +	.driver_module = THIS_MODULE,
> +};
> +
>  #define DECLARE_AD7793_CHANNELS(_name, _b, _sb, _s) \
>  const struct iio_chan_spec _name##_channels[] = { \
>  	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), (_s)), \
> @@ -569,6 +609,15 @@ const struct iio_chan_spec _name##_channels[] = { \
>  	IIO_CHAN_SOFT_TIMESTAMP(9), \
>  }
>  
> +#define DECLARE_AD7797_CHANNELS(_name, _b, _sb) \
> +const struct iio_chan_spec _name##_channels[] = { \
> +	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \
> +	AD_SD_SHORTED_CHANNEL(1, 0, AD7793_CH_AIN1M_AIN1M, (_b), (_sb), 0), \
> +	AD_SD_TEMP_CHANNEL(2, AD7793_CH_TEMP, (_b), (_sb), 0), \
> +	AD_SD_SUPPLY_CHANNEL(3, 3, AD7793_CH_AVDD_MONITOR, (_b), (_sb), 0), \
> +	IIO_CHAN_SOFT_TIMESTAMP(4), \
> +}
> +
>  #define DECLARE_AD7799_CHANNELS(_name, _b, _sb) \
>  const struct iio_chan_spec _name##_channels[] = { \
>  	AD_SD_DIFF_CHANNEL(0, 0, 0, AD7793_CH_AIN1P_AIN1M, (_b), (_sb), 0), \
> @@ -584,6 +633,8 @@ static DECLARE_AD7793_CHANNELS(ad7792, 16, 32, 0);
>  static DECLARE_AD7793_CHANNELS(ad7793, 24, 32, 0);
>  static DECLARE_AD7795_CHANNELS(ad7794, 16, 32);
>  static DECLARE_AD7795_CHANNELS(ad7795, 24, 32);
> +static DECLARE_AD7797_CHANNELS(ad7796, 16, 16);
> +static DECLARE_AD7797_CHANNELS(ad7797, 24, 32);
>  static DECLARE_AD7799_CHANNELS(ad7798, 16, 16);
>  static DECLARE_AD7799_CHANNELS(ad7799, 24, 32);
>  
> @@ -592,56 +643,100 @@ static const struct ad7793_chip_info ad7793_chip_info_tbl[] = {
>  		.id = AD7785_ID,
>  		.channels = ad7785_channels,
>  		.num_channels = ARRAY_SIZE(ad7785_channels),
> +		.iio_info = &ad7793_info,
> +		.sample_freq_avail = ad7793_sample_freq_avail,
>  		.flags = AD7793_FLAG_HAS_CLKSEL |
>  			AD7793_FLAG_HAS_REFSEL |
>  			AD7793_FLAG_HAS_VBIAS |
> -			AD7793_HAS_EXITATION_CURRENT,
> +			AD7793_HAS_EXITATION_CURRENT |
> +			AD7793_FLAG_HAS_GAIN |
> +			AD7793_FLAG_HAS_BUFFER,
>  	},
>  	[ID_AD7792] = {
>  		.id = AD7792_ID,
>  		.channels = ad7792_channels,
>  		.num_channels = ARRAY_SIZE(ad7792_channels),
> +		.iio_info = &ad7793_info,
> +		.sample_freq_avail = ad7793_sample_freq_avail,
>  		.flags = AD7793_FLAG_HAS_CLKSEL |
>  			AD7793_FLAG_HAS_REFSEL |
>  			AD7793_FLAG_HAS_VBIAS |
> -			AD7793_HAS_EXITATION_CURRENT,
> +			AD7793_HAS_EXITATION_CURRENT |
> +			AD7793_FLAG_HAS_GAIN |
> +			AD7793_FLAG_HAS_BUFFER,
>  	},
>  	[ID_AD7793] = {
>  		.id = AD7793_ID,
>  		.channels = ad7793_channels,
>  		.num_channels = ARRAY_SIZE(ad7793_channels),
> +		.iio_info = &ad7793_info,
> +		.sample_freq_avail = ad7793_sample_freq_avail,
>  		.flags = AD7793_FLAG_HAS_CLKSEL |
>  			AD7793_FLAG_HAS_REFSEL |
>  			AD7793_FLAG_HAS_VBIAS |
> -			AD7793_HAS_EXITATION_CURRENT,
> +			AD7793_HAS_EXITATION_CURRENT |
> +			AD7793_FLAG_HAS_GAIN |
> +			AD7793_FLAG_HAS_BUFFER,
>  	},
>  	[ID_AD7794] = {
>  		.id = AD7794_ID,
>  		.channels = ad7794_channels,
>  		.num_channels = ARRAY_SIZE(ad7794_channels),
> +		.iio_info = &ad7793_info,
> +		.sample_freq_avail = ad7793_sample_freq_avail,
>  		.flags = AD7793_FLAG_HAS_CLKSEL |
>  			AD7793_FLAG_HAS_REFSEL |
>  			AD7793_FLAG_HAS_VBIAS |
> -			AD7793_HAS_EXITATION_CURRENT,
> +			AD7793_HAS_EXITATION_CURRENT |
> +			AD7793_FLAG_HAS_GAIN |
> +			AD7793_FLAG_HAS_BUFFER,
>  	},
>  	[ID_AD7795] = {
>  		.id = AD7795_ID,
>  		.channels = ad7795_channels,
>  		.num_channels = ARRAY_SIZE(ad7795_channels),
> +		.iio_info = &ad7793_info,
> +		.sample_freq_avail = ad7793_sample_freq_avail,
>  		.flags = AD7793_FLAG_HAS_CLKSEL |
>  			AD7793_FLAG_HAS_REFSEL |
>  			AD7793_FLAG_HAS_VBIAS |
> -			AD7793_HAS_EXITATION_CURRENT,
> +			AD7793_HAS_EXITATION_CURRENT |
> +			AD7793_FLAG_HAS_GAIN |
> +			AD7793_FLAG_HAS_BUFFER,
> +	},
> +	[ID_AD7796] = {
> +		.id = AD7796_ID,
> +		.channels = ad7796_channels,
> +		.num_channels = ARRAY_SIZE(ad7796_channels),
> +		.iio_info = &ad7797_info,
> +		.sample_freq_avail = ad7797_sample_freq_avail,
> +		.flags = AD7793_FLAG_HAS_CLKSEL,
> +	},
> +	[ID_AD7797] = {
> +		.id = AD7797_ID,
> +		.channels = ad7797_channels,
> +		.num_channels = ARRAY_SIZE(ad7797_channels),
> +		.iio_info = &ad7797_info,
> +		.sample_freq_avail = ad7797_sample_freq_avail,
> +		.flags = AD7793_FLAG_HAS_CLKSEL,
>  	},
>  	[ID_AD7798] = {
>  		.id = AD7798_ID,
>  		.channels = ad7798_channels,
>  		.num_channels = ARRAY_SIZE(ad7798_channels),
> +		.iio_info = &ad7793_info,
> +		.sample_freq_avail = ad7793_sample_freq_avail,
> +		.flags = AD7793_FLAG_HAS_GAIN |
> +			AD7793_FLAG_HAS_BUFFER,
>  	},
>  	[ID_AD7799] = {
>  		.id = AD7799_ID,
>  		.channels = ad7799_channels,
>  		.num_channels = ARRAY_SIZE(ad7799_channels),
> +		.iio_info = &ad7793_info,
> +		.sample_freq_avail = ad7793_sample_freq_avail,
> +		.flags = AD7793_FLAG_HAS_GAIN |
> +			AD7793_FLAG_HAS_BUFFER,
>  	},
>  };
>  
> @@ -702,7 +797,7 @@ static int __devinit ad7793_probe(struct spi_device *spi)
>  	indio_dev->modes = INDIO_DIRECT_MODE;
>  	indio_dev->channels = st->chip_info->channels;
>  	indio_dev->num_channels = st->chip_info->num_channels;
> -	indio_dev->info = &ad7793_info;
> +	indio_dev->info = st->chip_info->iio_info;
>  
>  	ret = ad_sd_setup_buffer_and_trigger(indio_dev);
>  	if (ret)
> @@ -757,6 +852,8 @@ static const struct spi_device_id ad7793_id[] = {
>  	{"ad7793", ID_AD7793},
>  	{"ad7794", ID_AD7794},
>  	{"ad7795", ID_AD7795},
> +	{"ad7796", ID_AD7796},
> +	{"ad7797", ID_AD7797},
>  	{"ad7798", ID_AD7798},
>  	{"ad7799", ID_AD7799},
>  	{}
>