Re: [PATCH] iio: adc: add driver for MCP3204/08 12-bit ADC
Hi, On 16:07 Wed 01 May , Lars-Peter Clausen wrote: > On 05/01/2013 12:21 AM, Oskar Andero wrote: > > This adds support for Microchip's 12 bit AD converters MCP3204 and > > MCP3208. These chips communicates over SPI and supports single-ended > > and pseudo-differential configurations. > > > > Cc: Jonathan Cameron > > Cc: Lars-Peter Clausen > > Signed-off-by: Oskar Andero > > Hi, > > Looks very good in general. A few minor things, mostly related to the > regulator > handling and a couple of nitpicks inline. Thanks for reviewing! I will prepare version 2 shortly. > > + > > + ret = regulator_enable(adc->reg); > > + if (ret < 0) > > + goto reg_free; > > + } else { > > + adc->ref_mv = pdata->ref_mv; > > I'd like to see this fallback path go away. For supplies with a const voltage > the fixed-voltage-regulator can be used. > Ok. I added this since the voltage I use for reference is behind a level-shifter, meaning there is actually no regulator on the board providing that exact voltage level. Not sure what you mean with "the fixed-voltage-regulator", but maybe that is what I am looking for in my case? Thanks! -Oskar -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Re: [PATCH] iio: adc: add driver for MCP3204/08 12-bit ADC
On 05/01/2013 12:21 AM, Oskar Andero wrote: > This adds support for Microchip's 12 bit AD converters MCP3204 and > MCP3208. These chips communicates over SPI and supports single-ended > and pseudo-differential configurations. > > Cc: Jonathan Cameron > Cc: Lars-Peter Clausen > Signed-off-by: Oskar Andero Hi, Looks very good in general. A few minor things, mostly related to the regulator handling and a couple of nitpicks inline. > --- > drivers/iio/adc/Kconfig | 10 ++ > drivers/iio/adc/Makefile | 1 + > drivers/iio/adc/mcp320x.c | 261 > ++ > include/linux/platform_data/mcp320x.h | 23 +++ > 4 files changed, 295 insertions(+) > create mode 100644 drivers/iio/adc/mcp320x.c > create mode 100644 include/linux/platform_data/mcp320x.h > > diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig > index ab0767e6..93129ec 100644 > --- a/drivers/iio/adc/Kconfig > +++ b/drivers/iio/adc/Kconfig [...] > + > +static int mcp320x_read_raw(struct iio_dev *iio, > + struct iio_chan_spec const *channel, int *val, > + int *val2, long mask) > +{ > + struct mcp320x *adc = iio_priv(iio); > + int ret = -EINVAL; > + > + mutex_lock(>lock); > + > + switch (mask) { > + case IIO_CHAN_INFO_RAW: [...] > + case IIO_CHAN_INFO_SCALE: > + /* Digital output code = (4096 * Vin) / Vref */ > + if (!IS_ERR_OR_NULL(adc->reg)) { > + ret = regulator_get_voltage(adc->reg); > + if (ret < 0) > + goto out; > + *val = ret / 1000; > + } else { > + *val = adc->ref_mv; > + } > + *val2 = 4096 * 1000; The scale of voltage channels is in mV. So I think the * 1000 should be removed. > + ret = IIO_VAL_FRACTIONAL; > + break; > + > + default: > + break; > + } > + > +out: > + mutex_unlock(>lock); > + > + return ret; > +} [...]h > +static int mcp320x_probe(struct spi_device *spi) > +{ > + struct mcp320x_platform_data *pdata = spi->dev.platform_data; > + struct iio_dev *iio; It's not a big deal, but usually we call the iio_dev variabl indio_dev would be nice for consistency to use this name in your driver as well. > + struct mcp320x *adc; > + int ret; > + > + if (!pdata) { > + dev_err(>dev, "No platform data!"); > + return -EINVAL; > + } > + > + iio = iio_device_alloc(sizeof(*adc)); > + if (!iio) > + return -ENOMEM; > + > + adc = iio_priv(iio); > + adc->spi = spi; > + > + iio->dev.parent = >dev; > + iio->name = spi_get_device_id(spi)->name; > + iio->modes = INDIO_DIRECT_MODE; > + iio->info = _info; > + > + if (spi_get_device_id(spi)->driver_data == mcp3204) { > + iio->channels = mcp3204_channels; > + iio->num_channels = ARRAY_SIZE(mcp3204_channels); > + } else { > + iio->channels = mcp3208_channels; > + iio->num_channels = ARRAY_SIZE(mcp3208_channels); > + } Usually we use a lookup table for this. E.g struct mcp3208_chip_info { struct iio_chan_spec *channels; unsigned int num_channels; }; static const struct mcp3208_chip_info[] = { [mcp3204] = { .channels = mcp3204_channels, .num_channels = ARRAY_SIZE(mcp3204_channels) }, [mcp3204] = { ... }, }; indio_dev->channels = mcp3208_chip_info[id].channels; indio_dev->num_channels = mcp3208_chip_info[id].num_channels; This keeps things a bit more tidy. Especially if more chip variants are added later. > + > + adc->transfer[0].tx_buf = >tx_buf; > + adc->transfer[0].len = sizeof(adc->tx_buf); > + adc->transfer[1].rx_buf = adc->rx_buf; > + adc->transfer[1].len = sizeof(adc->rx_buf); > + > + spi_message_init(>msg); > + spi_message_add_tail(>transfer[0], >msg); > + spi_message_add_tail(>transfer[1], >msg); There is a new helper function which makes this a bit shorter: spi_message_init_with_transfers(>msg, adc->transfer, ARRAY_SIZE(adc->transfer)); > + > + if (pdata->reg) { > + adc->reg = regulator_get(>dev, pdata->reg); This not how the regulator API is supposed to be used. The regulator name should be const. E.g. "vref". Your board code then provides a lookup table map the regulator to the name in the consumer. > + if (IS_ERR_OR_NULL(adc->reg)) > + return PTR_ERR(adc->reg); So what happens in the OR_NULL case? I think it is save to just use IS_ERR(adc->reg) > + > + ret = regulator_enable(adc->reg); > + if (ret < 0) > + goto reg_free; > + } else { > + adc->ref_mv = pdata->ref_mv; I'd like to see this fallback path go
Re: [PATCH] iio: adc: add driver for MCP3204/08 12-bit ADC
On 05/01/2013 12:21 AM, Oskar Andero wrote: This adds support for Microchip's 12 bit AD converters MCP3204 and MCP3208. These chips communicates over SPI and supports single-ended and pseudo-differential configurations. Cc: Jonathan Cameron ji...@cam.ac.uk Cc: Lars-Peter Clausen l...@metafoo.de Signed-off-by: Oskar Andero oskar.and...@gmail.com Hi, Looks very good in general. A few minor things, mostly related to the regulator handling and a couple of nitpicks inline. --- drivers/iio/adc/Kconfig | 10 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/mcp320x.c | 261 ++ include/linux/platform_data/mcp320x.h | 23 +++ 4 files changed, 295 insertions(+) create mode 100644 drivers/iio/adc/mcp320x.c create mode 100644 include/linux/platform_data/mcp320x.h diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index ab0767e6..93129ec 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig [...] + +static int mcp320x_read_raw(struct iio_dev *iio, + struct iio_chan_spec const *channel, int *val, + int *val2, long mask) +{ + struct mcp320x *adc = iio_priv(iio); + int ret = -EINVAL; + + mutex_lock(adc-lock); + + switch (mask) { + case IIO_CHAN_INFO_RAW: [...] + case IIO_CHAN_INFO_SCALE: + /* Digital output code = (4096 * Vin) / Vref */ + if (!IS_ERR_OR_NULL(adc-reg)) { + ret = regulator_get_voltage(adc-reg); + if (ret 0) + goto out; + *val = ret / 1000; + } else { + *val = adc-ref_mv; + } + *val2 = 4096 * 1000; The scale of voltage channels is in mV. So I think the * 1000 should be removed. + ret = IIO_VAL_FRACTIONAL; + break; + + default: + break; + } + +out: + mutex_unlock(adc-lock); + + return ret; +} [...]h +static int mcp320x_probe(struct spi_device *spi) +{ + struct mcp320x_platform_data *pdata = spi-dev.platform_data; + struct iio_dev *iio; It's not a big deal, but usually we call the iio_dev variabl indio_dev would be nice for consistency to use this name in your driver as well. + struct mcp320x *adc; + int ret; + + if (!pdata) { + dev_err(spi-dev, No platform data!); + return -EINVAL; + } + + iio = iio_device_alloc(sizeof(*adc)); + if (!iio) + return -ENOMEM; + + adc = iio_priv(iio); + adc-spi = spi; + + iio-dev.parent = spi-dev; + iio-name = spi_get_device_id(spi)-name; + iio-modes = INDIO_DIRECT_MODE; + iio-info = mcp320x_info; + + if (spi_get_device_id(spi)-driver_data == mcp3204) { + iio-channels = mcp3204_channels; + iio-num_channels = ARRAY_SIZE(mcp3204_channels); + } else { + iio-channels = mcp3208_channels; + iio-num_channels = ARRAY_SIZE(mcp3208_channels); + } Usually we use a lookup table for this. E.g struct mcp3208_chip_info { struct iio_chan_spec *channels; unsigned int num_channels; }; static const struct mcp3208_chip_info[] = { [mcp3204] = { .channels = mcp3204_channels, .num_channels = ARRAY_SIZE(mcp3204_channels) }, [mcp3204] = { ... }, }; indio_dev-channels = mcp3208_chip_info[id].channels; indio_dev-num_channels = mcp3208_chip_info[id].num_channels; This keeps things a bit more tidy. Especially if more chip variants are added later. + + adc-transfer[0].tx_buf = adc-tx_buf; + adc-transfer[0].len = sizeof(adc-tx_buf); + adc-transfer[1].rx_buf = adc-rx_buf; + adc-transfer[1].len = sizeof(adc-rx_buf); + + spi_message_init(adc-msg); + spi_message_add_tail(adc-transfer[0], adc-msg); + spi_message_add_tail(adc-transfer[1], adc-msg); There is a new helper function which makes this a bit shorter: spi_message_init_with_transfers(adc-msg, adc-transfer, ARRAY_SIZE(adc-transfer)); + + if (pdata-reg) { + adc-reg = regulator_get(spi-dev, pdata-reg); This not how the regulator API is supposed to be used. The regulator name should be const. E.g. vref. Your board code then provides a lookup table map the regulator to the name in the consumer. + if (IS_ERR_OR_NULL(adc-reg)) + return PTR_ERR(adc-reg); So what happens in the OR_NULL case? I think it is save to just use IS_ERR(adc-reg) + + ret = regulator_enable(adc-reg); + if (ret 0) + goto reg_free; + } else { + adc-ref_mv = pdata-ref_mv; I'd like to see this fallback path go away. For supplies with a const voltage the
Re: [PATCH] iio: adc: add driver for MCP3204/08 12-bit ADC
Hi, On 16:07 Wed 01 May , Lars-Peter Clausen wrote: On 05/01/2013 12:21 AM, Oskar Andero wrote: This adds support for Microchip's 12 bit AD converters MCP3204 and MCP3208. These chips communicates over SPI and supports single-ended and pseudo-differential configurations. Cc: Jonathan Cameron ji...@cam.ac.uk Cc: Lars-Peter Clausen l...@metafoo.de Signed-off-by: Oskar Andero oskar.and...@gmail.com Hi, Looks very good in general. A few minor things, mostly related to the regulator handling and a couple of nitpicks inline. Thanks for reviewing! I will prepare version 2 shortly. + + ret = regulator_enable(adc-reg); + if (ret 0) + goto reg_free; + } else { + adc-ref_mv = pdata-ref_mv; I'd like to see this fallback path go away. For supplies with a const voltage the fixed-voltage-regulator can be used. Ok. I added this since the voltage I use for reference is behind a level-shifter, meaning there is actually no regulator on the board providing that exact voltage level. Not sure what you mean with the fixed-voltage-regulator, but maybe that is what I am looking for in my case? Thanks! -Oskar -- To unsubscribe from this list: send the line unsubscribe linux-kernel in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
[PATCH] iio: adc: add driver for MCP3204/08 12-bit ADC
This adds support for Microchip's 12 bit AD converters MCP3204 and MCP3208. These chips communicates over SPI and supports single-ended and pseudo-differential configurations. Cc: Jonathan Cameron Cc: Lars-Peter Clausen Signed-off-by: Oskar Andero --- drivers/iio/adc/Kconfig | 10 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/mcp320x.c | 261 ++ include/linux/platform_data/mcp320x.h | 23 +++ 4 files changed, 295 insertions(+) create mode 100644 drivers/iio/adc/mcp320x.c create mode 100644 include/linux/platform_data/mcp320x.h diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index ab0767e6..93129ec 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -133,6 +133,16 @@ config MAX1363 max11646, max11647) Provides direct access via sysfs and buffered data via the iio dev interface. +config MCP320X + tristate "Microchip Technology MCP3204/08" + depends on SPI + help + Say yes here to build support for Microchip Technology's MCP3204 or + MCP3208 analog to digital converter. + + This driver can also be built as a module. If so, the module will be + called mcp320x. + config TI_ADC081C tristate "Texas Instruments ADC081C021/027" depends on I2C diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 0a825be..8f475d3 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_AT91_ADC) += at91_adc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o obj-$(CONFIG_MAX1363) += max1363.o +obj-$(CONFIG_MCP320X) += mcp320x.o obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c new file mode 100644 index 000..cb308e8 --- /dev/null +++ b/drivers/iio/adc/mcp320x.c @@ -0,0 +1,261 @@ +/* + * Copyright (C) 2013 Oskar Andero + * + * Driver for Microchip Technology's MCP3204 and MCP3208 ADC chips. + * Datasheet can be found here: + * http://ww1.microchip.com/downloads/en/devicedoc/21298c.pdf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include +#include +#include +#include +#include +#include + +#define MCP_SINGLE_ENDED (1 << 3) +#define MCP_START_BIT (1 << 4) + +enum { + mcp3204, + mcp3208, +}; + +struct mcp320x { + struct spi_device *spi; + struct spi_message msg; + struct spi_transfer transfer[2]; + + u8 tx_buf; + u8 rx_buf[2]; + + struct regulator *reg; + unsigned int ref_mv; + + struct mutex lock; +}; + +static int mcp320x_adc_conversion(struct mcp320x *adc, u8 msg) +{ + int ret; + + adc->tx_buf = msg; + ret = spi_sync(adc->spi, >msg); + if (ret < 0) + return ret; + + return ((adc->rx_buf[0] & 0x3f) << 6) | + (adc->rx_buf[1] >> 2); +} + +static int mcp320x_read_raw(struct iio_dev *iio, + struct iio_chan_spec const *channel, int *val, + int *val2, long mask) +{ + struct mcp320x *adc = iio_priv(iio); + int ret = -EINVAL; + + mutex_lock(>lock); + + switch (mask) { + case IIO_CHAN_INFO_RAW: + if (channel->differential) + ret = mcp320x_adc_conversion(adc, + MCP_START_BIT | channel->address); + else + ret = mcp320x_adc_conversion(adc, + MCP_START_BIT | MCP_SINGLE_ENDED | + channel->address); + if (ret < 0) + goto out; + + *val = ret; + ret = IIO_VAL_INT; + break; + + case IIO_CHAN_INFO_SCALE: + /* Digital output code = (4096 * Vin) / Vref */ + if (!IS_ERR_OR_NULL(adc->reg)) { + ret = regulator_get_voltage(adc->reg); + if (ret < 0) + goto out; + *val = ret / 1000; + } else { + *val = adc->ref_mv; + } + *val2 = 4096 * 1000; + ret = IIO_VAL_FRACTIONAL; + break; + + default: + break; + } + +out: + mutex_unlock(>lock); + + return ret; +} + +#define MCP320X_VOLTAGE_CHANNEL(num) \ + { \ + .type = IIO_VOLTAGE,\ + .indexed = 1, \ + .channel =
[PATCH] iio: adc: add driver for MCP3204/08 12-bit ADC
This adds support for Microchip's 12 bit AD converters MCP3204 and MCP3208. These chips communicates over SPI and supports single-ended and pseudo-differential configurations. Cc: Jonathan Cameron ji...@cam.ac.uk Cc: Lars-Peter Clausen l...@metafoo.de Signed-off-by: Oskar Andero oskar.and...@gmail.com --- drivers/iio/adc/Kconfig | 10 ++ drivers/iio/adc/Makefile | 1 + drivers/iio/adc/mcp320x.c | 261 ++ include/linux/platform_data/mcp320x.h | 23 +++ 4 files changed, 295 insertions(+) create mode 100644 drivers/iio/adc/mcp320x.c create mode 100644 include/linux/platform_data/mcp320x.h diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig index ab0767e6..93129ec 100644 --- a/drivers/iio/adc/Kconfig +++ b/drivers/iio/adc/Kconfig @@ -133,6 +133,16 @@ config MAX1363 max11646, max11647) Provides direct access via sysfs and buffered data via the iio dev interface. +config MCP320X + tristate Microchip Technology MCP3204/08 + depends on SPI + help + Say yes here to build support for Microchip Technology's MCP3204 or + MCP3208 analog to digital converter. + + This driver can also be built as a module. If so, the module will be + called mcp320x. + config TI_ADC081C tristate Texas Instruments ADC081C021/027 depends on I2C diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile index 0a825be..8f475d3 100644 --- a/drivers/iio/adc/Makefile +++ b/drivers/iio/adc/Makefile @@ -14,6 +14,7 @@ obj-$(CONFIG_AT91_ADC) += at91_adc.o obj-$(CONFIG_EXYNOS_ADC) += exynos_adc.o obj-$(CONFIG_LP8788_ADC) += lp8788_adc.o obj-$(CONFIG_MAX1363) += max1363.o +obj-$(CONFIG_MCP320X) += mcp320x.o obj-$(CONFIG_TI_ADC081C) += ti-adc081c.o obj-$(CONFIG_TI_AM335X_ADC) += ti_am335x_adc.o obj-$(CONFIG_VIPERBOARD_ADC) += viperboard_adc.o diff --git a/drivers/iio/adc/mcp320x.c b/drivers/iio/adc/mcp320x.c new file mode 100644 index 000..cb308e8 --- /dev/null +++ b/drivers/iio/adc/mcp320x.c @@ -0,0 +1,261 @@ +/* + * Copyright (C) 2013 Oskar Andero oskar.and...@gmail.com + * + * Driver for Microchip Technology's MCP3204 and MCP3208 ADC chips. + * Datasheet can be found here: + * http://ww1.microchip.com/downloads/en/devicedoc/21298c.pdf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include linux/err.h +#include linux/spi/spi.h +#include linux/module.h +#include linux/iio/iio.h +#include linux/regulator/consumer.h +#include linux/platform_data/mcp320x.h + +#define MCP_SINGLE_ENDED (1 3) +#define MCP_START_BIT (1 4) + +enum { + mcp3204, + mcp3208, +}; + +struct mcp320x { + struct spi_device *spi; + struct spi_message msg; + struct spi_transfer transfer[2]; + + u8 tx_buf; + u8 rx_buf[2]; + + struct regulator *reg; + unsigned int ref_mv; + + struct mutex lock; +}; + +static int mcp320x_adc_conversion(struct mcp320x *adc, u8 msg) +{ + int ret; + + adc-tx_buf = msg; + ret = spi_sync(adc-spi, adc-msg); + if (ret 0) + return ret; + + return ((adc-rx_buf[0] 0x3f) 6) | + (adc-rx_buf[1] 2); +} + +static int mcp320x_read_raw(struct iio_dev *iio, + struct iio_chan_spec const *channel, int *val, + int *val2, long mask) +{ + struct mcp320x *adc = iio_priv(iio); + int ret = -EINVAL; + + mutex_lock(adc-lock); + + switch (mask) { + case IIO_CHAN_INFO_RAW: + if (channel-differential) + ret = mcp320x_adc_conversion(adc, + MCP_START_BIT | channel-address); + else + ret = mcp320x_adc_conversion(adc, + MCP_START_BIT | MCP_SINGLE_ENDED | + channel-address); + if (ret 0) + goto out; + + *val = ret; + ret = IIO_VAL_INT; + break; + + case IIO_CHAN_INFO_SCALE: + /* Digital output code = (4096 * Vin) / Vref */ + if (!IS_ERR_OR_NULL(adc-reg)) { + ret = regulator_get_voltage(adc-reg); + if (ret 0) + goto out; + *val = ret / 1000; + } else { + *val = adc-ref_mv; + } + *val2 = 4096 * 1000; + ret = IIO_VAL_FRACTIONAL; + break; + + default: + break; + } + +out: + mutex_unlock(adc-lock); + + return ret; +} + +#define MCP320X_VOLTAGE_CHANNEL(num) \ + {