iio: adc: mcp3422: Add support for MCP3425
Subsystems (2)
PATCH 1/1 iio: adc: mcp3422: Add support for MCP3425
The MCP3425 is a single channel up to 16-bit A/D converter which has features:
- On-Board Programmable Gain Amplifier (PGA):
- Gains of 1, 2, 4 or 8
- Programmable Data Rate Options:
- 15 SPS (16 bits), 60 SPS (14 bits), 240 SPS (12 bits)
So we can support MCP3425 with a little changes to mcp3422 driver.
--- Documentation/devicetree/bindings/iio/adc/mcp3422.txt | 1 + drivers/iio/adc/Kconfig | 4 ++-- drivers/iio/adc/mcp3422.c | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-)
Documentation/devicetree/bindings/iio/adc/mcp3422.txt +1 -0
@@ -5,6 +5,7 @@ Required properties: "microchip,mcp3422" or "microchip,mcp3423" or "microchip,mcp3424" or + "microchip,mcp3425" or "microchip,mcp3426" or "microchip,mcp3427" or "microchip,mcp3428"
drivers/iio/adc/Kconfig +2 -2
@@ -246,11 +246,11 @@ config MCP320X called mcp320x. config MCP3422 - tristate "Microchip Technology MCP3422/3/4/6/7/8 driver" + tristate "Microchip Technology MCP3422/3/4/5/6/7/8 driver" depends on I2C help Say yes here to build support for Microchip Technology's - MCP3422, MCP3423, MCP3424, MCP3426, MCP3427 or MCP3428 + MCP3422, MCP3423, MCP3424, MCP3425, MCP3426, MCP3427 or MCP3428 analog to digital converters. This driver can also be built as a module. If so, the module will be
drivers/iio/adc/mcp3422.c +13 -3
@@ -1,11 +1,12 @@/* -* mcp3422.c - driver for the Microchip mcp3422/3/4/6/7/8 chip family +* mcp3422.c - driver for the Microchip mcp3422/3/4/5/6/7/8 chip family * * Copyright (C) 2013, Angelo Compagnucci * Author: Angelo Compagnucci <[email protected]> * * Datasheet: http://ww1.microchip.com/downloads/en/devicedoc/22088b.pdf * http://ww1.microchip.com/downloads/en/DeviceDoc/22226a.pdf +* http://ww1.microchip.com/downloads/en/DeviceDoc/22072b.pdf * * This driver exports the value of analog input voltage to sysfs, the * voltage unit is nV.
@@ -317,6 +318,10 @@ static const struct iio_chan_spec mcp3424_channels[] = { MCP3422_CHAN(3), }; +static const struct iio_chan_spec mcp3425_channels[] = { +MCP3422_CHAN (0 ), +}; +static const struct iio_info mcp3422_info = { .read_raw = mcp3422_read_raw, .write_raw = mcp3422_write_raw,
@@ -352,6 +357,10 @@ static int mcp3422_probe(struct i2c_client *client, indio_dev->info = &mcp3422_info;switch (adc->id) { +case 5 : + indio_dev->channels = mcp3425_channels; + indio_dev->num_channels =ARRAY_SIZE (mcp3425_channels); +break ;case 2 :case 3 :case 6 :
@@ -368,7 +377,7 @@ static int mcp3422_probe(struct i2c_client *client,/* meaningful default configuration */ config = (MCP3422_CONT_SAMPLING - |MCP3422_CHANNEL_VALUE (1 ) + |MCP3422_CHANNEL_VALUE (0 ) |MCP3422_PGA_VALUE (MCP3422_PGA_1 ) |MCP3422_SAMPLE_RATE_VALUE (MCP3422_SRATE_240 ));mcp3422_update_config (adc, config);
@@ -386,6 +395,7 @@ static const struct i2c_device_id mcp3422_id[] = { { "mcp3422", 2 }, { "mcp3423", 3 }, { "mcp3424", 4 }, + { "mcp3425", 5 }, { "mcp3426", 6 }, { "mcp3427", 7 }, { "mcp3428", 8 },
@@ -412,5 +422,5 @@ static struct i2c_driver mcp3422_driver = {module_i2c_driver (mcp3422_driver);MODULE_AUTHOR ("Angelo Compagnucci <[email protected]>" ); -MODULE_DESCRIPTION ("Microchip mcp3422/3/4/6/7/8 driver" ); +MODULE_DESCRIPTION ("Microchip mcp3422/3/4/5/6/7/8 driver" );MODULE_LICENSE ("GPL v2" );
Signature · 1 line
1.9.1
Quoted 9 lines · Akinobu Mita
The MCP3425 is a single channel up to 16-bit A/D converter which has features:
- On-Board Programmable Gain Amplifier (PGA):
- Gains of 1, 2, 4 or 8
- Programmable Data Rate Options:
- 15 SPS (16 bits), 60 SPS (14 bits), 240 SPS (12 bits)So we can support MCP3425 with a little changes to mcp3422 driver.
comments below
Quoted 62 lines
Signed-off-by Akinobu Mita <[email protected]>Cc Angelo Compagnucci <[email protected]>Cc Jonathan Cameron <[email protected]>Cc Hartmut Knaack <[email protected]>Cc Lars-Peter Clausen <[email protected]>Cc Peter Meerwald <[email protected]>--- Documentation/devicetree/bindings/iio/adc/mcp3422.txt | 1 + drivers/iio/adc/Kconfig | 4 ++-- drivers/iio/adc/mcp3422.c | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/iio/adc/mcp3422.txt +1
-0@@ -5,6 +5,7 @@ Required properties: "microchip,mcp3422" or "microchip,mcp3423" or "microchip,mcp3424" or + "microchip,mcp3425" or "microchip,mcp3426" or "microchip,mcp3427" or "microchip,mcp3428"drivers/iio/adc/Kconfig +2
-2@@ -246,11 +246,11 @@ config MCP320X called mcp320x. config MCP3422 - tristate "Microchip Technology MCP3422/3/4/6/7/8 driver" + tristate "Microchip Technology MCP3422/3/4/5/6/7/8 driver" depends on I2C help Say yes here to build support for Microchip Technology's - MCP3422, MCP3423, MCP3424, MCP3426, MCP3427 or MCP3428 + MCP3422, MCP3423, MCP3424, MCP3425, MCP3426, MCP3427 or MCP3428 analog to digital converters. This driver can also be built as a module. If so, the module will bedrivers/iio/adc/mcp3422.c +2
-1@@ -1,11 +1,12 @@/* -* mcp3422.c - driver for the Microchip mcp3422/3/4/6/7/8 chip family +* mcp3422.c - driver for the Microchip mcp3422/3/4/5/6/7/8 chip family * * Copyright (C) 2013, Angelo Compagnucci * Author: Angelo Compagnucci <[email protected]> * * Datasheet: http://ww1.microchip.com/downloads/en/devicedoc/22088b.pdf * http://ww1.microchip.com/downloads/en/DeviceDoc/22226a.pdf +* http://ww1.microchip.com/downloads/en/DeviceDoc/22072b.pdf * * This driver exports the value of analog input voltage to sysfs, the * voltage unit is nV.
drivers/iio/adc/mcp3422.c static const struct iio_chan_spec mcp3424_channels[] = { · line 323
Quoted 6 lines
drivers/iio/adc/mcp3422.c +3
-0@@ -317,6 +318,10 @@ static const struct iio_chan_spec mcp3424_channels[] = { MCP3422_CHAN(3), }; +static const struct iio_chan_spec mcp3425_channels[] = { +MCP3422_CHAN (0 ), +};
I think the idea is to reuse mcp3421_channels also for mcp3425 (both have just one channel), so the above struct is not needed
+
drivers/iio/adc/mcp3422.c static int mcp3422_probe(struct i2c_client *client, · line 363
Quoted 11 lines
drivers/iio/adc/mcp3422.c +4
-0static const struct iio_info mcp3422_info = { .read_raw = mcp3422_read_raw, .write_raw = mcp3422_write_raw,@@ -352,6 +357,10 @@ static int mcp3422_probe(struct i2c_client *client, indio_dev->info = &mcp3422_info;switch (adc->id) { +case 5 : + indio_dev->channels = mcp3425_channels; + indio_dev->num_channels =ARRAY_SIZE (mcp3425_channels); +break ;
just do
case 1:
case 5:
indio_dev->channels = mcp3421_channels;
indio_dev->num_channels = ARRAY_SIZE(mcp3421_channels);
break;drivers/iio/adc/mcp3422.c static int mcp3422_probe(struct i2c_client *client, · line 380
Quoted 9 lines
drivers/iio/adc/mcp3422.c +1
-1case 2 :case 3 :case 6 :@@ -368,7 +377,7 @@ static int mcp3422_probe(struct i2c_client *client,/* meaningful default configuration */ config = (MCP3422_CONT_SAMPLING - | MCP3422_CHANNEL_VALUE(1) + | MCP3422_CHANNEL_VALUE(0)
why is the default behaviour changed? this should go in a separate patch together with justification
is MCP3422_CHANNEL_VALUE(1) correct for the mcp3421? maybe this would be a bugfix rather...
Quoted 19 lines
drivers/iio/adc/mcp3422.c +2
-1| MCP3422_PGA_VALUE(MCP3422_PGA_1) | MCP3422_SAMPLE_RATE_VALUE(MCP3422_SRATE_240));mcp3422_update_config (adc, config);@@ -386,6 +395,7 @@ static const struct i2c_device_id mcp3422_id[] = { { "mcp3422", 2 }, { "mcp3423", 3 }, { "mcp3424", 4 }, + { "mcp3425", 5 }, { "mcp3426", 6 }, { "mcp3427", 7 }, { "mcp3428", 8 },@@ -412,5 +422,5 @@ static struct i2c_driver mcp3422_driver = {module_i2c_driver (mcp3422_driver);MODULE_AUTHOR ("Angelo Compagnucci <[email protected]>" ); -MODULE_DESCRIPTION ("Microchip mcp3422/3/4/6/7/8 driver" ); +MODULE_DESCRIPTION ("Microchip mcp3422/3/4/5/6/7/8 driver" );MODULE_LICENSE ("GPL v2" );
Signature · 2 lines
Peter Meerwald-Stadler +43-664-2444418 (mobile)
2015-12-25 7:23 GMT+09:00 Peter Meerwald-Stadler <[email protected]>:
Quoted 79 lines · Akinobu Mita
Quoted 10 lines
The MCP3425 is a single channel up to 16-bit A/D converter which has features:
- On-Board Programmable Gain Amplifier (PGA):
- Gains of 1, 2, 4 or 8
- Programmable Data Rate Options:
- 15 SPS (16 bits), 60 SPS (14 bits), 240 SPS (12 bits)So we can support MCP3425 with a little changes to mcp3422 driver.
comments below
Quoted 65 lines
Signed-off-by Akinobu Mita <[email protected]>Cc Angelo Compagnucci <[email protected]>Cc Jonathan Cameron <[email protected]>Cc Hartmut Knaack <[email protected]>Cc Lars-Peter Clausen <[email protected]>Cc Peter Meerwald <[email protected]>--- Documentation/devicetree/bindings/iio/adc/mcp3422.txt | 1 + drivers/iio/adc/Kconfig | 4 ++-- drivers/iio/adc/mcp3422.c | 16 +++++++++++++--- 3 files changed, 16 insertions(+), 5 deletions(-)Documentation/devicetree/bindings/iio/adc/mcp3422.txt +1
-0@@ -5,6 +5,7 @@ Required properties: "microchip,mcp3422" or "microchip,mcp3423" or "microchip,mcp3424" or + "microchip,mcp3425" or "microchip,mcp3426" or "microchip,mcp3427" or "microchip,mcp3428"drivers/iio/adc/Kconfig +2
-2@@ -246,11 +246,11 @@ config MCP320X called mcp320x. config MCP3422 - tristate "Microchip Technology MCP3422/3/4/6/7/8 driver" + tristate "Microchip Technology MCP3422/3/4/5/6/7/8 driver" depends on I2C help Say yes here to build support for Microchip Technology's - MCP3422, MCP3423, MCP3424, MCP3426, MCP3427 or MCP3428 + MCP3422, MCP3423, MCP3424, MCP3425, MCP3426, MCP3427 or MCP3428 analog to digital converters. This driver can also be built as a module. If so, the module will bedrivers/iio/adc/mcp3422.c +2
-1@@ -1,11 +1,12 @@/* -* mcp3422.c - driver for the Microchip mcp3422/3/4/6/7/8 chip family +* mcp3422.c - driver for the Microchip mcp3422/3/4/5/6/7/8 chip family * * Copyright (C) 2013, Angelo Compagnucci * Author: Angelo Compagnucci <[email protected]> * * Datasheet: http://ww1.microchip.com/downloads/en/devicedoc/22088b.pdf * http://ww1.microchip.com/downloads/en/DeviceDoc/22226a.pdf +* http://ww1.microchip.com/downloads/en/DeviceDoc/22072b.pdf * * This driver exports the value of analog input voltage to sysfs, the * voltage unit is nV. @@ -317,6 +318,10 @@ static const struct iio_chan_spec mcp3424_channels[] = { MCP3422_CHAN(3), };
Quoted 6 lines
drivers/iio/adc/mcp3422.c static const struct iio_chan_spec mcp3424_channels[] = { · line 323
Quoted 3 lines
drivers/iio/adc/mcp3422.c +3
-0+static const struct iio_chan_spec mcp3425_channels[] = { +MCP3422_CHAN (0 ), +};I think the idea is to reuse
mcp3421_channelsalso for mcp3425 (both have just one channel), so the above struct is not needed
You are right. I didn't noticed another single channel variant is supported in iio.git.
Quoted 16 lines
+
drivers/iio/adc/mcp3422.c static int mcp3422_probe(struct i2c_client *client, · line 363
Quoted 11 lines
drivers/iio/adc/mcp3422.c +4
-0static const struct iio_info mcp3422_info = { .read_raw = mcp3422_read_raw, .write_raw = mcp3422_write_raw,@@ -352,6 +357,10 @@ static int mcp3422_probe(struct i2c_client *client, indio_dev->info = &mcp3422_info;switch (adc->id) { +case 5 : + indio_dev->channels = mcp3425_channels; + indio_dev->num_channels =ARRAY_SIZE (mcp3425_channels); +break ;just do
case 1:
case 5:
Quoted 4 lines
indio_dev->channels = mcp3421_channels;
indio_dev->num_channels = ARRAY_SIZE(mcp3421_channels);
break;OK.
Quoted 5 lines
Quoted 5 lines
drivers/iio/adc/mcp3422.c +0
-0case 2 :case 3 :case 6 :@@ -368,7 +377,7 @@ static int mcp3422_probe(struct i2c_client *client,
Quoted 7 lines
drivers/iio/adc/mcp3422.c static int mcp3422_probe(struct i2c_client *client, · line 380
Quoted 4 lines
drivers/iio/adc/mcp3422.c +1
-1/* meaningful default configuration */ config = (MCP3422_CONT_SAMPLING - | MCP3422_CHANNEL_VALUE(1) + | MCP3422_CHANNEL_VALUE(0)why is the default behaviour changed? this should go in a separate patch together with justification
adc->confing for mcp3422 driver is just used as cache for recently accessed channel's configuration which is get updated when another channel is accessed. So I think this doesn't cause user visible change but I agree this change should go in a separate patch.
Quoted 2 lines
is
MCP3422_CHANNEL_VALUE(1)correct for the mcp3421? maybe this would be a bugfix rather...
This field is just no effect for the single channel devices and this doesn't cause problem but someone who read this code may confuse a little.
Quoted 24 lines
Quoted 13 lines
drivers/iio/adc/mcp3422.c +1
-0| MCP3422_PGA_VALUE(MCP3422_PGA_1) | MCP3422_SAMPLE_RATE_VALUE(MCP3422_SRATE_240));mcp3422_update_config (adc, config);@@ -386,6 +395,7 @@ static const struct i2c_device_id mcp3422_id[] = { { "mcp3422", 2 }, { "mcp3423", 3 }, { "mcp3424", 4 }, + { "mcp3425", 5 }, { "mcp3426", 6 }, { "mcp3427", 7 }, { "mcp3428", 8 },drivers/iio/adc/mcp3422.c static struct i2c_driver mcp3422_driver = { · line 426
Quoted 6 lines
drivers/iio/adc/mcp3422.c +1
-1@@ -412,5 +422,5 @@ static struct i2c_driver mcp3422_driver = {module_i2c_driver (mcp3422_driver);MODULE_AUTHOR ("Angelo Compagnucci <[email protected]>" ); -MODULE_DESCRIPTION ("Microchip mcp3422/3/4/6/7/8 driver" ); +MODULE_DESCRIPTION ("Microchip mcp3422/3/4/5/6/7/8 driver" );MODULE_LICENSE ("GPL v2" );--
Peter Meerwald-Stadler
+43-664-2444418 (mobile)