Add support for the whole MCP39xx family
Subsystems (3)
Marcus Folkesson
maintainerv8 cover Add support for the whole MCP39xx family
The main goal with this patchset is to add support for all similar MCP39xx ADC chips.
During all patch iterations we ended up with a few cleanup patches.
See version notes in each patch.
Marcus Folkesson (6):
dt-bindings: iio: adc: mcp3911: add support for the whole MCP39xx
family
iio: adc: mcp3911: make use of dev_err_probe()
iio: adc: mcp3911: simplify usage of spi->dev
iio: adc: mcp3911: fix indentation
iio: adc: mcp3911: avoid ambiguity parameters in macros
iio: adc: mcp3911: add support for the whole MCP39xx family
.../bindings/iio/adc/microchip,mcp3911.yaml | 6 + drivers/iio/adc/Kconfig | 6 +- drivers/iio/adc/mcp3911.c | 562 ++++++++++++++---- 3 files changed, 462 insertions(+), 112 deletions(-)
base-commit: b320441c04c9bea76cbee1196ae55c20288fd7a6
Signature · 1 line
2.41.0
Marcus Folkesson
maintainerPATCH v8 1/6 dt-bindings: iio: adc: mcp3911: add support for the whole MCP39xx family
Microchip does have many similar chips, add those to the compatible string as the driver support is extended.
The new supported chips are:
- microchip,mcp3910
- microchip,mcp3912
- microchip,mcp3913
- microchip,mcp3914
- microchip,mcp3918
- microchip,mcp3919
---
Notes:
v2:
- No changes
v3:
- No changes
v4:
- No changes
v5:
- No changes
v6:
- No changes
v7:
- No changes
v8:
- No changes
.../devicetree/bindings/iio/adc/microchip,mcp3911.yaml | 6 ++++++ 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/iio/adc/microchip,mcp3911.yaml +6 -0
@@ -18,7 +18,13 @@ description: | properties: compatible: enum: + - microchip,mcp3910 - microchip,mcp3911 + - microchip,mcp3912 + - microchip,mcp3913 + - microchip,mcp3914 + - microchip,mcp3918 + - microchip,mcp3919 reg: maxItems: 1
Signature · 1 line
2.41.0
Marcus Folkesson
maintainerPATCH v8 2/6 iio: adc: mcp3911: make use of dev_err_probe()
In reply to Marcus FolkessonSimplify code by switch to dev_err_probe().
---
Notes:
v5:
- New patch in this series
v6:
- fix xmas tree order
v7:
- use dev_err_probe for config and scale function as well
v8:
- No changes
drivers/iio/adc/mcp3911.c | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-)
drivers/iio/adc/mcp3911.c +7 -16
@@ -277,10 +277,7 @@ static int mcp3911_calc_scale_table(struct mcp3911 *adc)if (adc->vref) { ret =regulator_get_voltage (adc->vref);if (ret <0 ) { -dev_err (&adc->spi->dev, -"failed to get vref voltage: %d\n" , - ret); -return ret; +return dev_err_probe (&adc->spi->dev, ret,"failed to get vref voltage\n" ); } ref = ret /1000 ;
@@ -396,10 +393,9 @@ static int mcp3911_config(struct mcp3911 *adc)if (ret)device_property_read_u32 (dev,"device-addr" , &adc->dev_addr);if (adc->dev_addr >3 ) { -dev_err (&adc->spi->dev, -"invalid device address (%i). Must be in range 0-3.\n" , - adc->dev_addr); -return -EINVAL ; +return dev_err_probe (dev, -EINVAL , +"invalid device address (%i). Must be in range 0-3.\n" , + adc->dev_addr); }dev_dbg (&adc->spi->dev,"use device address %i\n" , adc->dev_addr);
@@ -466,6 +462,7 @@ static const struct iio_trigger_ops mcp3911_trigger_ops = {static int mcp3911_probe (struct spi_device *spi) { +struct device *dev = &spi->dev;struct iio_dev *indio_dev;struct mcp3911 *adc;int ret;
@@ -482,10 +479,7 @@ static int mcp3911_probe(struct spi_device *spi)if (PTR_ERR (adc->vref) == -ENODEV ) { adc->vref =NULL ; }else { -dev_err (&adc->spi->dev, -"failed to get regulator (%ld)\n" , -PTR_ERR (adc->vref)); -return PTR_ERR (adc->vref); +return dev_err_probe (dev,PTR_ERR (adc->vref),"failed to get regulator\n" ); } }else {
@@ -504,10 +498,7 @@ static int mcp3911_probe(struct spi_device *spi)if (PTR_ERR (adc->clki) == -ENOENT ) { adc->clki =NULL ; }else { -dev_err (&adc->spi->dev, -"failed to get adc clk (%ld)\n" , -PTR_ERR (adc->clki)); -return PTR_ERR (adc->clki); +return dev_err_probe (dev,PTR_ERR (adc->clki),"failed to get adc clk\n" ); } }
Signature · 1 line
2.41.0
Marcus Folkesson
maintainerPATCH v8 3/6 iio: adc: mcp3911: simplify usage of spi->dev
In reply to Marcus FolkessonReplace the usage of adc->spi->dev with dev to make the code prettier.
---
Notes:
v4:
- New patch in this series
v5:
- Introduce struct device *dev to more functions
v6:
- cosmetics
v7:
- compress some calls to two lines
v8:
- No changes
drivers/iio/adc/mcp3911.c | 50 ++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 27 deletions(-)
drivers/iio/adc/mcp3911.c +23 -27
@@ -269,6 +269,7 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev,static int mcp3911_calc_scale_table (struct mcp3911 *adc) { +struct device *dev = &adc->spi->dev;u32 ref =MCP3911_INT_VREF_MV ;u32 div;int ret;
@@ -277,7 +278,7 @@ static int mcp3911_calc_scale_table(struct mcp3911 *adc)if (adc->vref) { ret =regulator_get_voltage (adc->vref);if (ret <0 ) { -return dev_err_probe (&adc->spi->dev, ret,"failed to get vref voltage\n" ); +return dev_err_probe (dev, ret,"failed to get vref voltage\n" ); } ref = ret /1000 ;
@@ -334,6 +335,7 @@ static irqreturn_t mcp3911_trigger_handler(int irq, void *p)struct iio_poll_func *pf = p;struct iio_dev *indio_dev = pf->indio_dev;struct mcp3911 *adc =iio_priv (indio_dev); +struct device *dev = &adc->spi->dev;struct spi_transfer xfer[] = { { .tx_buf = &adc->tx_buf,
@@ -351,8 +353,7 @@ static irqreturn_t mcp3911_trigger_handler(int irq, void *p) adc->tx_buf =MCP3911_REG_READ (MCP3911_CHANNEL (0 ), adc->dev_addr); ret =spi_sync_transfer (adc->spi, xfer,ARRAY_SIZE (xfer));if (ret <0 ) { -dev_warn (&adc->spi->dev, -"failed to get conversion data\n" ); +dev_warn (dev,"failed to get conversion data\n" ); goto out; }
@@ -397,7 +398,7 @@ static int mcp3911_config(struct mcp3911 *adc)"invalid device address (%i). Must be in range 0-3.\n" , adc->dev_addr); } -dev_dbg (&adc->spi->dev,"use device address %i\n" , adc->dev_addr); +dev_dbg (dev,"use device address %i\n" , adc->dev_addr); ret =mcp3911_read (adc,MCP3911_REG_CONFIG , ®val,2 );if (ret)
@@ -405,21 +406,19 @@ static int mcp3911_config(struct mcp3911 *adc) regval &= ~MCP3911_CONFIG_VREFEXT ;if (adc->vref) { -dev_dbg (&adc->spi->dev,"use external voltage reference\n" ); +dev_dbg (dev,"use external voltage reference\n" ); regval |=FIELD_PREP (MCP3911_CONFIG_VREFEXT ,1 ); }else { -dev_dbg (&adc->spi->dev, -"use internal voltage reference (1.2V)\n" ); +dev_dbg (dev,"use internal voltage reference (1.2V)\n" ); regval |=FIELD_PREP (MCP3911_CONFIG_VREFEXT ,0 ); } regval &= ~MCP3911_CONFIG_CLKEXT ;if (adc->clki) { -dev_dbg (&adc->spi->dev,"use external clock as clocksource\n" ); +dev_dbg (dev,"use external clock as clocksource\n" ); regval |=FIELD_PREP (MCP3911_CONFIG_CLKEXT ,1 ); }else { -dev_dbg (&adc->spi->dev, -"use crystal oscillator as clocksource\n" ); +dev_dbg (dev,"use crystal oscillator as clocksource\n" ); regval |=FIELD_PREP (MCP3911_CONFIG_CLKEXT ,0 ); }
@@ -467,14 +466,14 @@ static int mcp3911_probe(struct spi_device *spi)struct mcp3911 *adc;int ret; - indio_dev =devm_iio_device_alloc (&spi->dev,sizeof (*adc)); + indio_dev =devm_iio_device_alloc (dev,sizeof (*adc));if (!indio_dev)return -ENOMEM ; adc =iio_priv (indio_dev); adc->spi = spi; - adc->vref =devm_regulator_get_optional (&adc->spi->dev,"vref" ); + adc->vref =devm_regulator_get_optional (dev,"vref" );if (IS_ERR (adc->vref)) {if (PTR_ERR (adc->vref) == -ENODEV ) { adc->vref =NULL ;
@@ -487,13 +486,12 @@ static int mcp3911_probe(struct spi_device *spi)if (ret)return ret; - ret =devm_add_action_or_reset (&spi->dev, - mcp3911_cleanup_regulator, adc->vref); + ret =devm_add_action_or_reset (dev, mcp3911_cleanup_regulator, adc->vref);if (ret)return ret; } - adc->clki =devm_clk_get_enabled (&adc->spi->dev,NULL ); + adc->clki =devm_clk_get_enabled (dev,NULL );if (IS_ERR (adc->clki)) {if (PTR_ERR (adc->clki) == -ENOENT ) { adc->clki =NULL ;
@@ -506,7 +504,7 @@ static int mcp3911_probe(struct spi_device *spi)if (ret)return ret; -if (device_property_read_bool (&adc->spi->dev,"microchip,data-ready-hiz" )) +if (device_property_read_bool (dev,"microchip,data-ready-hiz" )) ret =mcp3911_update (adc,MCP3911_REG_STATUSCOM ,MCP3911_STATUSCOM_DRHIZ ,0 ,2 );else
@@ -540,15 +538,14 @@ static int mcp3911_probe(struct spi_device *spi)mutex_init (&adc->lock);if (spi->irq >0 ) { - adc->trig =devm_iio_trigger_alloc (&spi->dev,"%s-dev%d" , - indio_dev->name, -iio_device_id (indio_dev)); + adc->trig =devm_iio_trigger_alloc (dev,"%s-dev%d" , indio_dev->name, +iio_device_id (indio_dev));if (!adc->trig)return -ENOMEM ; adc->trig->ops = &mcp3911_trigger_ops;iio_trigger_set_drvdata (adc->trig, adc); - ret =devm_iio_trigger_register (&spi->dev, adc->trig); + ret =devm_iio_trigger_register (dev, adc->trig);if (ret)return ret;
@@ -557,20 +554,19 @@ static int mcp3911_probe(struct spi_device *spi)* Some platforms might not allow the option to power it down so * don't enable the interrupt to avoid extra load on the system. */ - ret =devm_request_irq (&spi->dev, spi->irq, - &iio_trigger_generic_data_rdy_poll,IRQF_NO_AUTOEN |IRQF_ONESHOT , - indio_dev->name, adc->trig); + ret =devm_request_irq (dev, spi->irq, &iio_trigger_generic_data_rdy_poll, +IRQF_NO_AUTOEN |IRQF_ONESHOT , + indio_dev->name, adc->trig);if (ret)return ret; } - ret =devm_iio_triggered_buffer_setup (&spi->dev, indio_dev, -NULL , - mcp3911_trigger_handler,NULL ); + ret =devm_iio_triggered_buffer_setup (dev, indio_dev,NULL , + mcp3911_trigger_handler,NULL );if (ret)return ret; -return devm_iio_device_register (&adc->spi->dev, indio_dev); +return devm_iio_device_register (dev, indio_dev); }static const struct of_device_id mcp3911_dt_ids[] = {
Signature · 1 line
2.41.0
Marcus Folkesson
maintainerPATCH v8 4/6 iio: adc: mcp3911: fix indentation
In reply to Marcus FolkessonThe whole file does not make use of indentation properly. Do something about it.
---
Notes:
v4:
- New patch in this series
v5:
- Cosmetics
v6:
- Little rewording in commit message
v7:
- No changes
v8:
- No changes
drivers/iio/adc/mcp3911.c | 41 +++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 21 deletions(-)
drivers/iio/adc/mcp3911.c +20 -21
@@ -33,7 +33,7 @@#define MCP3911_GAIN_VAL (ch, val) ((val << 3 * ch) & MCP3911_GAIN_MASK(ch))#define MCP3911_REG_STATUSCOM 0x0a -#define MCP3911_STATUSCOM_DRHIZ BIT(12) +#define MCP3911_STATUSCOM_DRHIZ BIT(12)#define MCP3911_STATUSCOM_READ GENMASK(7, 6)#define MCP3911_STATUSCOM_CH1_24WIDTH BIT(4)#define MCP3911_STATUSCOM_CH0_24WIDTH BIT(3)
@@ -111,8 +111,7 @@ static int mcp3911_write(struct mcp3911 *adc, u8 reg, u32 val, u8 len)return spi_write (adc->spi, &val, len +1 ); } -static int mcp3911_update (struct mcp3911 *adc,u8 reg,u32 mask, -u32 val,u8 len) +static int mcp3911_update (struct mcp3911 *adc,u8 reg,u32 mask,u32 val,u8 len) {u32 tmp;int ret;
@@ -127,8 +126,8 @@ static int mcp3911_update(struct mcp3911 *adc, u8 reg, u32 mask, }static int mcp3911_write_raw_get_fmt (struct iio_dev *indio_dev, -struct iio_chan_spec const *chan, -long mask) +struct iio_chan_spec const *chan, +long mask) {switch (mask) {case IIO_CHAN_INFO_SCALE :
@@ -141,9 +140,9 @@ static int mcp3911_write_raw_get_fmt(struct iio_dev *indio_dev, }static int mcp3911_read_avail (struct iio_dev *indio_dev, -struct iio_chan_spec const *chan, -const int **vals,int *type,int *length, -long info) +struct iio_chan_spec const *chan, +const int **vals,int *type,int *length, +long info) {switch (info) {case IIO_CHAN_INFO_OVERSAMPLING_RATIO :
@@ -212,8 +211,8 @@ static int mcp3911_read_raw(struct iio_dev *indio_dev, }static int mcp3911_write_raw (struct iio_dev *indio_dev, -struct iio_chan_spec const *channel,int val, -int val2,long mask) +struct iio_chan_spec const *channel,int val, +int val2,long mask) {struct mcp3911 *adc =iio_priv (indio_dev);int ret = -EINVAL ;
@@ -223,12 +222,12 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev,case IIO_CHAN_INFO_SCALE :for (int i =0 ; i <MCP3911_NUM_SCALES ; i++) {if (val == mcp3911_scale_table[i][0 ] && - val2 == mcp3911_scale_table[i][1 ]) { + 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 ); +MCP3911_GAIN_MASK (channel->channel), +MCP3911_GAIN_VAL (channel->channel, i),1 ); } }break ;
@@ -246,8 +245,8 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev,/* Enable offset*/ ret =mcp3911_update (adc,MCP3911_REG_STATUSCOM , -MCP3911_STATUSCOM_EN_OFFCAL , -MCP3911_STATUSCOM_EN_OFFCAL ,2 ); +MCP3911_STATUSCOM_EN_OFFCAL , +MCP3911_STATUSCOM_EN_OFFCAL ,2 );break ;case IIO_CHAN_INFO_OVERSAMPLING_RATIO :
@@ -255,7 +254,7 @@ static int mcp3911_write_raw(struct iio_dev *indio_dev,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 ); + val,2 );break ; } }
@@ -506,10 +505,10 @@ static int mcp3911_probe(struct spi_device *spi)if (device_property_read_bool (dev,"microchip,data-ready-hiz" )) ret =mcp3911_update (adc,MCP3911_REG_STATUSCOM ,MCP3911_STATUSCOM_DRHIZ , -0 ,2 ); +0 ,2 );else ret =mcp3911_update (adc,MCP3911_REG_STATUSCOM ,MCP3911_STATUSCOM_DRHIZ , -MCP3911_STATUSCOM_DRHIZ ,2 ); +MCP3911_STATUSCOM_DRHIZ ,2 );if (ret)return ret;
@@ -517,12 +516,12 @@ static int mcp3911_probe(struct spi_device *spi)if (ret)return ret; -/* Set gain to 1 for all channels */ +/* Set gain to 1 for all channels */ for (int i =0 ; i <MCP3911_NUM_CHANNELS ; i++) { adc->gain[i] =1 ; ret =mcp3911_update (adc,MCP3911_REG_GAIN , -MCP3911_GAIN_MASK (i), -MCP3911_GAIN_VAL (i,0 ),1 ); +MCP3911_GAIN_MASK (i), +MCP3911_GAIN_VAL (i,0 ),1 );if (ret)return ret; }
Signature · 1 line
2.41.0
Marcus Folkesson
maintainerPATCH v8 5/6 iio: adc: mcp3911: avoid ambiguity parameters in macros
In reply to Marcus FolkessonName macro parameters after what they represent instead of 'x' and make sure the evaluation of that will have no side effects.
---
Notes:
v5:
- New patch in this series
v6:
- change 'ch' to '(ch)'
v7:
- Reword commit message
v8:
- No changes
drivers/iio/adc/mcp3911.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/iio/adc/mcp3911.c +4 -4
@@ -29,8 +29,8 @@#define MCP3911_REG_MOD 0x06#define MCP3911_REG_PHASE 0x07#define MCP3911_REG_GAIN 0x09 -#define MCP3911_GAIN_MASK (ch) (GENMASK(2, 0) << 3 * ch) -#define MCP3911_GAIN_VAL (ch, val) ((val << 3 * ch) & MCP3911_GAIN_MASK(ch)) +#define MCP3911_GAIN_MASK (ch) (GENMASK(2, 0) << 3 * (ch)) +#define MCP3911_GAIN_VAL (ch, val) ((val << 3 * (ch)) & MCP3911_GAIN_MASK(ch))#define MCP3911_REG_STATUSCOM 0x0a#define MCP3911_STATUSCOM_DRHIZ BIT(12)
@@ -51,8 +51,8 @@#define MCP3911_REG_GAINCAL_CH1 0x17#define MCP3911_REG_VREFCAL 0x1a -#define MCP3911_CHANNEL (x) (MCP3911_REG_CHANNEL0 + x * 3) -#define MCP3911_OFFCAL (x) (MCP3911_REG_OFFCAL_CH0 + x * 6) +#define MCP3911_CHANNEL (ch) (MCP3911_REG_CHANNEL0 + (ch) * 3) +#define MCP3911_OFFCAL (ch) (MCP3911_REG_OFFCAL_CH0 + (ch) * 6)/* Internal voltage reference in mV */ #define MCP3911_INT_VREF_MV 1200
Signature · 1 line
2.41.0
Marcus Folkesson
maintainerPATCH v8 6/6 iio: adc: mcp3911: add support for the whole MCP39xx family
In reply to Marcus FolkessonMicrochip 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
---
Notes:
v2:
- Use callbacks rather than matching against enum for determine chip variants
v3:
- Fix cosmetics
v4:
- Do not pollute output variable upon error in *_get_osr() functions.
- Fix cosmetics
v5:
- Reorder text in Kconfig
- change val to u32 for *_get_osr(), *_set_osr() and *_set_scale()
- avoid ambiguity parameters in macro
v6:
- cosmetics
- Return on dev_err_probe()
v7:
- cosmetics
- introduce _enable_offset()
v8:
- Make osr unsigned
- Simplify enable_offset functions
drivers/iio/adc/Kconfig | 6 +- drivers/iio/adc/mcp3911.c | 466 +++++++++++++++++++++++++++++++++----- 2 files changed, 415 insertions(+), 57 deletions(-)
drivers/iio/adc/Kconfig +4 -2
@@ -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.
drivers/iio/adc/mcp3911.c +411 -55
594 lines not on this page · raw message
Signature · 1 line
2.41.0
Re: [PATCH v8 6/6] iio: adc: mcp3911: add support for the whole MCP39xx family
Quoted 10 lines · Marcus Folkesson
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
Forgot to include the tag from Andy:
Quoted 1 line
Signed-off-by Marcus Folkesson <[email protected]>
/Marcus
Jonathan Cameron
maintainerQuoted 15 lines · On Tue, 22 Aug 2023 21:22:53 +0200 Marcus Folkesson…
The main goal with this patchset is to add support for all similar MCP39xx ADC chips.
During all patch iterations we ended up with a few cleanup patches.See version notes in each patch.
Marcus Folkesson (6):
dt-bindings: iio: adc: mcp3911: add support for the whole MCP39xx
family
iio: adc: mcp3911: make use ofdev_err_probe()
iio: adc: mcp3911: simplify usage ofspi->dev
iio: adc: mcp3911: fix indentation
iio: adc: mcp3911: avoid ambiguity parameters in macros
iio: adc: mcp3911: add support for the whole MCP39xx family
Quoted 7 lines
.../bindings/iio/adc/microchip,mcp3911.yaml | 6 + drivers/iio/adc/Kconfig | 6 +- drivers/iio/adc/mcp3911.c | 562 ++++++++++++++---- 3 files changed, 462 insertions(+), 112 deletions(-)base-commit:
b320441c04c9bea76cbee1196ae55c20288fd7a6
Series applied.
Thanks to both Marcus (for working through the iterations) and Andy for providing the detailed feedback.
Jonathan