Commit 732ad342 authored by Marcus Folkesson's avatar Marcus Folkesson Committed by Jonathan Cameron

iio: adc: mcp3911: add support for the whole MCP39xx family

Microchip does have many similar chips, add support for those.

The new supported chips are:
  - microchip,mcp3910
  - microchip,mcp3912
  - microchip,mcp3913
  - microchip,mcp3914
  - microchip,mcp3918
  - microchip,mcp3919
Signed-off-by: default avatarMarcus Folkesson <marcus.folkesson@gmail.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230822192259.1125792-7-marcus.folkesson@gmail.comSigned-off-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
parent 593d7362
......@@ -785,8 +785,10 @@ config MCP3911
select IIO_BUFFER
select IIO_TRIGGERED_BUFFER
help
Say yes here to build support for Microchip Technology's MCP3911
analog to digital converter.
Say yes here to build support for one of the following
Microchip Technology's analog to digital converters:
MCP3910, MCP3911, MCP3912, MCP3913, MCP3914,
MCP3918 and MCP3919.
This driver can also be built as a module. If so, the module will be
called mcp3911.
......
......@@ -61,12 +61,56 @@
#define MCP3911_REG_WRITE(reg, id) ((((reg) << 1) | ((id) << 6) | (0 << 0)) & 0xff)
#define MCP3911_REG_MASK GENMASK(4, 1)
#define MCP3911_NUM_CHANNELS 2
#define MCP3911_NUM_SCALES 6
/* Registers compatible with MCP3910 */
#define MCP3910_REG_STATUSCOM 0x0c
#define MCP3910_STATUSCOM_READ GENMASK(23, 22)
#define MCP3910_STATUSCOM_DRHIZ BIT(20)
#define MCP3910_REG_GAIN 0x0b
#define MCP3910_REG_CONFIG0 0x0d
#define MCP3910_CONFIG0_EN_OFFCAL BIT(23)
#define MCP3910_CONFIG0_OSR GENMASK(15, 13)
#define MCP3910_REG_CONFIG1 0x0e
#define MCP3910_CONFIG1_CLKEXT BIT(6)
#define MCP3910_CONFIG1_VREFEXT BIT(7)
#define MCP3910_REG_OFFCAL_CH0 0x0f
#define MCP3910_OFFCAL(ch) (MCP3910_REG_OFFCAL_CH0 + (ch) * 6)
/* Maximal number of channels used by the MCP39XX family */
#define MCP39XX_MAX_NUM_CHANNELS 8
static const int mcp3911_osr_table[] = { 32, 64, 128, 256, 512, 1024, 2048, 4096 };
static u32 mcp3911_scale_table[MCP3911_NUM_SCALES][2];
enum mcp3911_id {
MCP3910,
MCP3911,
MCP3912,
MCP3913,
MCP3914,
MCP3918,
MCP3919,
};
struct mcp3911;
struct mcp3911_chip_info {
const struct iio_chan_spec *channels;
unsigned int num_channels;
int (*config)(struct mcp3911 *adc);
int (*get_osr)(struct mcp3911 *adc, u32 *val);
int (*set_osr)(struct mcp3911 *adc, u32 val);
int (*enable_offset)(struct mcp3911 *adc, bool enable);
int (*get_offset)(struct mcp3911 *adc, int channel, int *val);
int (*set_offset)(struct mcp3911 *adc, int channel, int val);
int (*set_scale)(struct mcp3911 *adc, int channel, u32 val);
};
struct mcp3911 {
struct spi_device *spi;
struct mutex lock;
......@@ -74,14 +118,15 @@ struct mcp3911 {
struct clk *clki;
u32 dev_addr;
struct iio_trigger *trig;
u32 gain[MCP3911_NUM_CHANNELS];
u32 gain[MCP39XX_MAX_NUM_CHANNELS];
const struct mcp3911_chip_info *chip;
struct {
u32 channels[MCP3911_NUM_CHANNELS];
u32 channels[MCP39XX_MAX_NUM_CHANNELS];
s64 ts __aligned(8);
} scan;
u8 tx_buf __aligned(IIO_DMA_MINALIGN);
u8 rx_buf[MCP3911_NUM_CHANNELS * 3];
u8 rx_buf[MCP39XX_MAX_NUM_CHANNELS * 3];
};
static int mcp3911_read(struct mcp3911 *adc, u8 reg, u32 *val, u8 len)
......@@ -125,6 +170,112 @@ static int mcp3911_update(struct mcp3911 *adc, u8 reg, u32 mask, u32 val, u8 len
return mcp3911_write(adc, reg, val, len);
}
static int mcp3910_enable_offset(struct mcp3911 *adc, bool enable)
{
unsigned int mask = MCP3910_CONFIG0_EN_OFFCAL;
unsigned int value = enable ? mask : 0;
return mcp3911_update(adc, MCP3910_REG_CONFIG0, mask, value, 3);
}
static int mcp3910_get_offset(struct mcp3911 *adc, int channel, int *val)
{
return mcp3911_read(adc, MCP3910_OFFCAL(channel), val, 3);
}
static int mcp3910_set_offset(struct mcp3911 *adc, int channel, int val)
{
int ret;
ret = mcp3911_write(adc, MCP3910_OFFCAL(channel), val, 3);
if (ret)
return ret;
return adc->chip->enable_offset(adc, 1);
}
static int mcp3911_enable_offset(struct mcp3911 *adc, bool enable)
{
unsigned int mask = MCP3911_STATUSCOM_EN_OFFCAL;
unsigned int value = enable ? mask : 0;
return mcp3911_update(adc, MCP3911_REG_STATUSCOM, mask, value, 2);
}
static int mcp3911_get_offset(struct mcp3911 *adc, int channel, int *val)
{
return mcp3911_read(adc, MCP3911_OFFCAL(channel), val, 3);
}
static int mcp3911_set_offset(struct mcp3911 *adc, int channel, int val)
{
int ret;
ret = mcp3911_write(adc, MCP3911_OFFCAL(channel), val, 3);
if (ret)
return ret;
return adc->chip->enable_offset(adc, 1);
}
static int mcp3910_get_osr(struct mcp3911 *adc, u32 *val)
{
int ret;
unsigned int osr;
ret = mcp3911_read(adc, MCP3910_REG_CONFIG0, val, 3);
if (ret)
return ret;
osr = FIELD_GET(MCP3910_CONFIG0_OSR, *val);
*val = 32 << osr;
return 0;
}
static int mcp3910_set_osr(struct mcp3911 *adc, u32 val)
{
unsigned int osr = FIELD_PREP(MCP3910_CONFIG0_OSR, val);
unsigned int mask = MCP3910_CONFIG0_OSR;
return mcp3911_update(adc, MCP3910_REG_CONFIG0, mask, osr, 3);
}
static int mcp3911_set_osr(struct mcp3911 *adc, u32 val)
{
unsigned int osr = FIELD_PREP(MCP3911_CONFIG_OSR, val);
unsigned int mask = MCP3911_CONFIG_OSR;
return mcp3911_update(adc, MCP3911_REG_CONFIG, mask, osr, 2);
}
static int mcp3911_get_osr(struct mcp3911 *adc, u32 *val)
{
int ret;
unsigned int osr;
ret = mcp3911_read(adc, MCP3911_REG_CONFIG, val, 2);
if (ret)
return ret;
osr = FIELD_GET(MCP3911_CONFIG_OSR, *val);
*val = 32 << osr;
return ret;
}
static int mcp3910_set_scale(struct mcp3911 *adc, int channel, u32 val)
{
return mcp3911_update(adc, MCP3910_REG_GAIN,
MCP3911_GAIN_MASK(channel),
MCP3911_GAIN_VAL(channel, val), 3);
}
static int mcp3911_set_scale(struct mcp3911 *adc, int channel, u32 val)
{
return mcp3911_update(adc, MCP3911_REG_GAIN,
MCP3911_GAIN_MASK(channel),
MCP3911_GAIN_VAL(channel, val), 1);
}
static int mcp3911_write_raw_get_fmt(struct iio_dev *indio_dev,
struct iio_chan_spec const *chan,
long mask)
......@@ -181,20 +332,18 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev,
break;
case IIO_CHAN_INFO_OFFSET:
ret = mcp3911_read(adc,
MCP3911_OFFCAL(channel->channel), val, 3);
ret = adc->chip->get_offset(adc, channel->channel, val);
if (ret)
goto out;
ret = IIO_VAL_INT;
break;
case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
ret = mcp3911_read(adc, MCP3911_REG_CONFIG, val, 2);
ret = adc->chip->get_osr(adc, val);
if (ret)
goto out;
*val = FIELD_GET(MCP3911_CONFIG_OSR, *val);
*val = 32 << *val;
ret = IIO_VAL_INT;
break;
......@@ -225,9 +374,7 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev,
val2 == mcp3911_scale_table[i][1]) {
adc->gain[channel->channel] = BIT(i);
ret = mcp3911_update(adc, MCP3911_REG_GAIN,
MCP3911_GAIN_MASK(channel->channel),
MCP3911_GAIN_VAL(channel->channel, i), 1);
ret = adc->chip->set_scale(adc, channel->channel, i);
}
}
break;
......@@ -237,24 +384,13 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev,
goto out;
}
/* Write offset */
ret = mcp3911_write(adc, MCP3911_OFFCAL(channel->channel), val,
3);
if (ret)
goto out;
/* Enable offset*/
ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM,
MCP3911_STATUSCOM_EN_OFFCAL,
MCP3911_STATUSCOM_EN_OFFCAL, 2);
ret = adc->chip->set_offset(adc, channel->channel, val);
break;
case IIO_CHAN_INFO_OVERSAMPLING_RATIO:
for (int i = 0; i < ARRAY_SIZE(mcp3911_osr_table); i++) {
if (val == mcp3911_osr_table[i]) {
val = FIELD_PREP(MCP3911_CONFIG_OSR, i);
ret = mcp3911_update(adc, MCP3911_REG_CONFIG, MCP3911_CONFIG_OSR,
val, 2);
ret = adc->chip->set_osr(adc, i);
break;
}
}
......@@ -323,12 +459,60 @@ static int mcp3911_calc_scale_table(struct mcp3911 *adc)
}, \
}
static const struct iio_chan_spec mcp3910_channels[] = {
MCP3911_CHAN(0),
MCP3911_CHAN(1),
IIO_CHAN_SOFT_TIMESTAMP(2),
};
static const struct iio_chan_spec mcp3911_channels[] = {
MCP3911_CHAN(0),
MCP3911_CHAN(1),
IIO_CHAN_SOFT_TIMESTAMP(2),
};
static const struct iio_chan_spec mcp3912_channels[] = {
MCP3911_CHAN(0),
MCP3911_CHAN(1),
MCP3911_CHAN(2),
MCP3911_CHAN(3),
IIO_CHAN_SOFT_TIMESTAMP(4),
};
static const struct iio_chan_spec mcp3913_channels[] = {
MCP3911_CHAN(0),
MCP3911_CHAN(1),
MCP3911_CHAN(2),
MCP3911_CHAN(3),
MCP3911_CHAN(4),
MCP3911_CHAN(5),
IIO_CHAN_SOFT_TIMESTAMP(6),
};
static const struct iio_chan_spec mcp3914_channels[] = {
MCP3911_CHAN(0),
MCP3911_CHAN(1),
MCP3911_CHAN(2),
MCP3911_CHAN(3),
MCP3911_CHAN(4),
MCP3911_CHAN(5),
MCP3911_CHAN(6),
MCP3911_CHAN(7),
IIO_CHAN_SOFT_TIMESTAMP(8),
};
static const struct iio_chan_spec mcp3918_channels[] = {
MCP3911_CHAN(0),
IIO_CHAN_SOFT_TIMESTAMP(1),
};
static const struct iio_chan_spec mcp3919_channels[] = {
MCP3911_CHAN(0),
MCP3911_CHAN(1),
MCP3911_CHAN(2),
IIO_CHAN_SOFT_TIMESTAMP(3),
};
static irqreturn_t mcp3911_trigger_handler(int irq, void *p)
{
struct iio_poll_func *pf = p;
......@@ -341,7 +525,7 @@ static irqreturn_t mcp3911_trigger_handler(int irq, void *p)
.len = 1,
}, {
.rx_buf = adc->rx_buf,
.len = sizeof(adc->rx_buf),
.len = (adc->chip->num_channels - 1) * 3,
},
};
int scan_index;
......@@ -384,21 +568,6 @@ static int mcp3911_config(struct mcp3911 *adc)
u32 regval;
int ret;
ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr);
/*
* Fallback to "device-addr" due to historical mismatch between
* dt-bindings and implementation
*/
if (ret)
device_property_read_u32(dev, "device-addr", &adc->dev_addr);
if (adc->dev_addr > 3) {
return dev_err_probe(dev, -EINVAL,
"invalid device address (%i). Must be in range 0-3.\n",
adc->dev_addr);
}
dev_dbg(dev, "use device address %i\n", adc->dev_addr);
ret = mcp3911_read(adc, MCP3911_REG_CONFIG, &regval, 2);
if (ret)
return ret;
......@@ -433,7 +602,97 @@ static int mcp3911_config(struct mcp3911 *adc)
regval &= ~MCP3911_STATUSCOM_READ;
regval |= FIELD_PREP(MCP3911_STATUSCOM_READ, 0x02);
return mcp3911_write(adc, MCP3911_REG_STATUSCOM, regval, 2);
regval &= ~MCP3911_STATUSCOM_DRHIZ;
if (device_property_read_bool(dev, "microchip,data-ready-hiz"))
regval |= FIELD_PREP(MCP3911_STATUSCOM_DRHIZ, 0);
else
regval |= FIELD_PREP(MCP3911_STATUSCOM_DRHIZ, 1);
/* Disable offset to ignore any old values in offset register */
regval &= ~MCP3911_STATUSCOM_EN_OFFCAL;
ret = mcp3911_write(adc, MCP3911_REG_STATUSCOM, regval, 2);
if (ret)
return ret;
/* Set gain to 1 for all channels */
ret = mcp3911_read(adc, MCP3911_REG_GAIN, &regval, 1);
if (ret)
return ret;
for (int i = 0; i < adc->chip->num_channels - 1; i++) {
adc->gain[i] = 1;
regval &= ~MCP3911_GAIN_MASK(i);
}
return mcp3911_write(adc, MCP3911_REG_GAIN, regval, 1);
}
static int mcp3910_config(struct mcp3911 *adc)
{
struct device *dev = &adc->spi->dev;
u32 regval;
int ret;
ret = mcp3911_read(adc, MCP3910_REG_CONFIG1, &regval, 3);
if (ret)
return ret;
regval &= ~MCP3910_CONFIG1_VREFEXT;
if (adc->vref) {
dev_dbg(dev, "use external voltage reference\n");
regval |= FIELD_PREP(MCP3910_CONFIG1_VREFEXT, 1);
} else {
dev_dbg(dev, "use internal voltage reference (1.2V)\n");
regval |= FIELD_PREP(MCP3910_CONFIG1_VREFEXT, 0);
}
regval &= ~MCP3910_CONFIG1_CLKEXT;
if (adc->clki) {
dev_dbg(dev, "use external clock as clocksource\n");
regval |= FIELD_PREP(MCP3910_CONFIG1_CLKEXT, 1);
} else {
dev_dbg(dev, "use crystal oscillator as clocksource\n");
regval |= FIELD_PREP(MCP3910_CONFIG1_CLKEXT, 0);
}
ret = mcp3911_write(adc, MCP3910_REG_CONFIG1, regval, 3);
if (ret)
return ret;
ret = mcp3911_read(adc, MCP3910_REG_STATUSCOM, &regval, 3);
if (ret)
return ret;
/* Address counter incremented, cycle through register types */
regval &= ~MCP3910_STATUSCOM_READ;
regval |= FIELD_PREP(MCP3910_STATUSCOM_READ, 0x02);
regval &= ~MCP3910_STATUSCOM_DRHIZ;
if (device_property_read_bool(dev, "microchip,data-ready-hiz"))
regval |= FIELD_PREP(MCP3910_STATUSCOM_DRHIZ, 0);
else
regval |= FIELD_PREP(MCP3910_STATUSCOM_DRHIZ, 1);
ret = mcp3911_write(adc, MCP3910_REG_STATUSCOM, regval, 3);
if (ret)
return ret;
/* Set gain to 1 for all channels */
ret = mcp3911_read(adc, MCP3910_REG_GAIN, &regval, 3);
if (ret)
return ret;
for (int i = 0; i < adc->chip->num_channels - 1; i++) {
adc->gain[i] = 1;
regval &= ~MCP3911_GAIN_MASK(i);
}
ret = mcp3911_write(adc, MCP3910_REG_GAIN, regval, 3);
if (ret)
return ret;
/* Disable offset to ignore any old values in offset register */
return adc->chip->enable_offset(adc, 0);
}
static void mcp3911_cleanup_regulator(void *vref)
......@@ -471,6 +730,7 @@ static int mcp3911_probe(struct spi_device *spi)
adc = iio_priv(indio_dev);
adc->spi = spi;
adc->chip = spi_get_device_match_data(spi);
adc->vref = devm_regulator_get_optional(dev, "vref");
if (IS_ERR(adc->vref)) {
......@@ -499,16 +759,21 @@ static int mcp3911_probe(struct spi_device *spi)
}
}
ret = mcp3911_config(adc);
/*
* Fallback to "device-addr" due to historical mismatch between
* dt-bindings and implementation.
*/
ret = device_property_read_u32(dev, "microchip,device-addr", &adc->dev_addr);
if (ret)
return ret;
device_property_read_u32(dev, "device-addr", &adc->dev_addr);
if (adc->dev_addr > 3) {
return dev_err_probe(dev, -EINVAL,
"invalid device address (%i). Must be in range 0-3.\n",
adc->dev_addr);
}
dev_dbg(dev, "use device address %i\n", adc->dev_addr);
if (device_property_read_bool(dev, "microchip,data-ready-hiz"))
ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ,
0, 2);
else
ret = mcp3911_update(adc, MCP3911_REG_STATUSCOM, MCP3911_STATUSCOM_DRHIZ,
MCP3911_STATUSCOM_DRHIZ, 2);
ret = adc->chip->config(adc);
if (ret)
return ret;
......@@ -517,7 +782,7 @@ static int mcp3911_probe(struct spi_device *spi)
return ret;
/* Set gain to 1 for all channels */
for (int i = 0; i < MCP3911_NUM_CHANNELS; i++) {
for (int i = 0; i < adc->chip->num_channels - 1; i++) {
adc->gain[i] = 1;
ret = mcp3911_update(adc, MCP3911_REG_GAIN,
MCP3911_GAIN_MASK(i),
......@@ -531,8 +796,8 @@ static int mcp3911_probe(struct spi_device *spi)
indio_dev->info = &mcp3911_info;
spi_set_drvdata(spi, indio_dev);
indio_dev->channels = mcp3911_channels;
indio_dev->num_channels = ARRAY_SIZE(mcp3911_channels);
indio_dev->channels = adc->chip->channels;
indio_dev->num_channels = adc->chip->num_channels;
mutex_init(&adc->lock);
......@@ -568,14 +833,105 @@ static int mcp3911_probe(struct spi_device *spi)
return devm_iio_device_register(dev, indio_dev);
}
static const struct mcp3911_chip_info mcp3911_chip_info[] = {
[MCP3910] = {
.channels = mcp3910_channels,
.num_channels = ARRAY_SIZE(mcp3910_channels),
.config = mcp3910_config,
.get_osr = mcp3910_get_osr,
.set_osr = mcp3910_set_osr,
.enable_offset = mcp3910_enable_offset,
.get_offset = mcp3910_get_offset,
.set_offset = mcp3910_set_offset,
.set_scale = mcp3910_set_scale,
},
[MCP3911] = {
.channels = mcp3911_channels,
.num_channels = ARRAY_SIZE(mcp3911_channels),
.config = mcp3911_config,
.get_osr = mcp3911_get_osr,
.set_osr = mcp3911_set_osr,
.enable_offset = mcp3911_enable_offset,
.get_offset = mcp3911_get_offset,
.set_offset = mcp3911_set_offset,
.set_scale = mcp3911_set_scale,
},
[MCP3912] = {
.channels = mcp3912_channels,
.num_channels = ARRAY_SIZE(mcp3912_channels),
.config = mcp3910_config,
.get_osr = mcp3910_get_osr,
.set_osr = mcp3910_set_osr,
.enable_offset = mcp3910_enable_offset,
.get_offset = mcp3910_get_offset,
.set_offset = mcp3910_set_offset,
.set_scale = mcp3910_set_scale,
},
[MCP3913] = {
.channels = mcp3913_channels,
.num_channels = ARRAY_SIZE(mcp3913_channels),
.config = mcp3910_config,
.get_osr = mcp3910_get_osr,
.set_osr = mcp3910_set_osr,
.enable_offset = mcp3910_enable_offset,
.get_offset = mcp3910_get_offset,
.set_offset = mcp3910_set_offset,
.set_scale = mcp3910_set_scale,
},
[MCP3914] = {
.channels = mcp3914_channels,
.num_channels = ARRAY_SIZE(mcp3914_channels),
.config = mcp3910_config,
.get_osr = mcp3910_get_osr,
.set_osr = mcp3910_set_osr,
.enable_offset = mcp3910_enable_offset,
.get_offset = mcp3910_get_offset,
.set_offset = mcp3910_set_offset,
.set_scale = mcp3910_set_scale,
},
[MCP3918] = {
.channels = mcp3918_channels,
.num_channels = ARRAY_SIZE(mcp3918_channels),
.config = mcp3910_config,
.get_osr = mcp3910_get_osr,
.set_osr = mcp3910_set_osr,
.enable_offset = mcp3910_enable_offset,
.get_offset = mcp3910_get_offset,
.set_offset = mcp3910_set_offset,
.set_scale = mcp3910_set_scale,
},
[MCP3919] = {
.channels = mcp3919_channels,
.num_channels = ARRAY_SIZE(mcp3919_channels),
.config = mcp3910_config,
.get_osr = mcp3910_get_osr,
.set_osr = mcp3910_set_osr,
.enable_offset = mcp3910_enable_offset,
.get_offset = mcp3910_get_offset,
.set_offset = mcp3910_set_offset,
.set_scale = mcp3910_set_scale,
},
};
static const struct of_device_id mcp3911_dt_ids[] = {
{ .compatible = "microchip,mcp3911" },
{ .compatible = "microchip,mcp3910", .data = &mcp3911_chip_info[MCP3910] },
{ .compatible = "microchip,mcp3911", .data = &mcp3911_chip_info[MCP3911] },
{ .compatible = "microchip,mcp3912", .data = &mcp3911_chip_info[MCP3912] },
{ .compatible = "microchip,mcp3913", .data = &mcp3911_chip_info[MCP3913] },
{ .compatible = "microchip,mcp3914", .data = &mcp3911_chip_info[MCP3914] },
{ .compatible = "microchip,mcp3918", .data = &mcp3911_chip_info[MCP3918] },
{ .compatible = "microchip,mcp3919", .data = &mcp3911_chip_info[MCP3919] },
{ }
};
MODULE_DEVICE_TABLE(of, mcp3911_dt_ids);
static const struct spi_device_id mcp3911_id[] = {
{ "mcp3911", 0 },
{ "mcp3910", (kernel_ulong_t)&mcp3911_chip_info[MCP3910] },
{ "mcp3911", (kernel_ulong_t)&mcp3911_chip_info[MCP3911] },
{ "mcp3912", (kernel_ulong_t)&mcp3911_chip_info[MCP3912] },
{ "mcp3913", (kernel_ulong_t)&mcp3911_chip_info[MCP3913] },
{ "mcp3914", (kernel_ulong_t)&mcp3911_chip_info[MCP3914] },
{ "mcp3918", (kernel_ulong_t)&mcp3911_chip_info[MCP3918] },
{ "mcp3919", (kernel_ulong_t)&mcp3911_chip_info[MCP3919] },
{ }
};
MODULE_DEVICE_TABLE(spi, mcp3911_id);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment