* [PATCH 1/7] iio: adc: ad7091r-base: Set alert config and drvdata
2023-11-21 21:33 [PATCH 0/7] Add support for AD7091R-2/-4/-8 marcelo.schmitt
@ 2023-11-21 21:34 ` marcelo.schmitt
2023-11-21 21:35 ` [PATCH 2/7] MAINTAINERS: Add MAINTAINERS entry for AD7091R marcelo.schmitt
` (5 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: marcelo.schmitt @ 2023-11-21 21:34 UTC (permalink / raw)
To: beniamin.bia, paul.cercueil, Michael.Hennerich, lars, jic23,
marcelo.schmitt1
Cc: Marcelo Schmitt, linux-iio, linux-kernel
From: Marcelo Schmitt <marcelo.schmitt@analog.com>
Write 1 to bit 4 in the configuration register to set ALERT/BUSY/GPO pin
to be used as ALERT.
Set device driver data so it can be retrieved when handling alert
events, avoiding null pointer dereference.
Fixes: <ca69300173b6> (iio: adc: Add support for AD7091R5 ADC)
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
---
drivers/iio/adc/ad7091r-base.c | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
diff --git a/drivers/iio/adc/ad7091r-base.c b/drivers/iio/adc/ad7091r-base.c
index 8e252cde735b..3ecac3164446 100644
--- a/drivers/iio/adc/ad7091r-base.c
+++ b/drivers/iio/adc/ad7091r-base.c
@@ -28,6 +28,7 @@
#define AD7091R_REG_RESULT_CONV_RESULT(x) ((x) & 0xfff)
/* AD7091R_REG_CONF */
+#define AD7091R_REG_CONF_ALERT_EN BIT(4)
#define AD7091R_REG_CONF_AUTO BIT(8)
#define AD7091R_REG_CONF_CMD BIT(10)
@@ -232,9 +233,16 @@ int ad7091r_probe(struct device *dev, const char *name,
iio_dev->channels = chip_info->channels;
if (irq) {
+ ret = regmap_update_bits(st->map, AD7091R_REG_CONF,
+ AD7091R_REG_CONF_ALERT_EN, BIT(4));
+ if (ret)
+ return ret;
+
+ dev_set_drvdata(st->dev, iio_dev);
ret = devm_request_threaded_irq(dev, irq, NULL,
- ad7091r_event_handler,
- IRQF_TRIGGER_FALLING | IRQF_ONESHOT, name, st);
+ ad7091r_event_handler,
+ IRQF_TRIGGER_FALLING |
+ IRQF_ONESHOT, name, st);
if (ret)
return ret;
}
--
2.42.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 2/7] MAINTAINERS: Add MAINTAINERS entry for AD7091R
2023-11-21 21:33 [PATCH 0/7] Add support for AD7091R-2/-4/-8 marcelo.schmitt
2023-11-21 21:34 ` [PATCH 1/7] iio: adc: ad7091r-base: Set alert config and drvdata marcelo.schmitt
@ 2023-11-21 21:35 ` marcelo.schmitt
2023-11-21 21:35 ` [PATCH 3/7] iio: adc: ad7091r: Move defines to header file marcelo.schmitt
` (4 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: marcelo.schmitt @ 2023-11-21 21:35 UTC (permalink / raw)
To: beniamin.bia, paul.cercueil, Michael.Hennerich, lars, jic23,
marcelo.schmitt1
Cc: Marcelo Schmitt, linux-iio, linux-kernel
From: Marcelo Schmitt <marcelo.schmitt@analog.com>
The driver for AD7091R was added in
ca693001: iio: adc: Add support for AD7091R5 ADC
but no MAINTAINERS file entry was added for it since then.
Add a proper MAINTAINERS file entry for the AD7091R driver.
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
---
MAINTAINERS | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8e0a91dc8251..008f0e73bead 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1126,6 +1126,16 @@ F: Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130
F: Documentation/devicetree/bindings/iio/adc/adi,ad4130.yaml
F: drivers/iio/adc/ad4130.c
+ANALOG DEVICES INC AD7091R DRIVER
+M: Marcelo Schmitt <marcelo.schmitt@analog.com>
+L: linux-iio@vger.kernel.org
+S: Supported
+W: http://ez.analog.com/community/linux-device-drivers
+F: Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
+F: drivers/iio/adc/drivers/iio/adc/ad7091r-base.c
+F: drivers/iio/adc/drivers/iio/adc/ad7091r-base.h
+F: drivers/iio/adc/drivers/iio/adc/ad7091r5.c
+
ANALOG DEVICES INC AD7192 DRIVER
M: Alexandru Tachici <alexandru.tachici@analog.com>
L: linux-iio@vger.kernel.org
--
2.42.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 3/7] iio: adc: ad7091r: Move defines to header file
2023-11-21 21:33 [PATCH 0/7] Add support for AD7091R-2/-4/-8 marcelo.schmitt
2023-11-21 21:34 ` [PATCH 1/7] iio: adc: ad7091r-base: Set alert config and drvdata marcelo.schmitt
2023-11-21 21:35 ` [PATCH 2/7] MAINTAINERS: Add MAINTAINERS entry for AD7091R marcelo.schmitt
@ 2023-11-21 21:35 ` marcelo.schmitt
2023-11-22 12:40 ` kernel test robot
2023-11-21 21:35 ` [PATCH 4/7] iio: adc: ad7091r: Alloc IIO device before generic probe marcelo.schmitt
` (3 subsequent siblings)
6 siblings, 1 reply; 13+ messages in thread
From: marcelo.schmitt @ 2023-11-21 21:35 UTC (permalink / raw)
To: beniamin.bia, paul.cercueil, Michael.Hennerich, lars, jic23,
marcelo.schmitt1
Cc: Marcelo Schmitt, linux-iio, linux-kernel
From: Marcelo Schmitt <marcelo.schmitt@analog.com>
Move AD7091R register, channel and event definitions to the header file
so other AD7091R device drivers may use those declaration in follow up
patches.
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
---
drivers/iio/adc/ad7091r-base.c | 14 +++--------
drivers/iio/adc/ad7091r-base.h | 45 ++++++++++++++++++++++++++++++++++
drivers/iio/adc/ad7091r5.c | 39 +++--------------------------
3 files changed, 53 insertions(+), 45 deletions(-)
diff --git a/drivers/iio/adc/ad7091r-base.c b/drivers/iio/adc/ad7091r-base.c
index 3ecac3164446..ebf1c8cca25c 100644
--- a/drivers/iio/adc/ad7091r-base.c
+++ b/drivers/iio/adc/ad7091r-base.c
@@ -15,14 +15,6 @@
#include "ad7091r-base.h"
-#define AD7091R_REG_RESULT 0
-#define AD7091R_REG_CHANNEL 1
-#define AD7091R_REG_CONF 2
-#define AD7091R_REG_ALERT 3
-#define AD7091R_REG_CH_LOW_LIMIT(ch) ((ch) * 3 + 4)
-#define AD7091R_REG_CH_HIGH_LIMIT(ch) ((ch) * 3 + 5)
-#define AD7091R_REG_CH_HYSTERESIS(ch) ((ch) * 3 + 6)
-
/* AD7091R_REG_RESULT */
#define AD7091R_REG_RESULT_CH_ID(x) (((x) >> 13) & 0x3)
#define AD7091R_REG_RESULT_CONV_RESULT(x) ((x) & 0xfff)
@@ -270,7 +262,7 @@ int ad7091r_probe(struct device *dev, const char *name,
}
EXPORT_SYMBOL_NS_GPL(ad7091r_probe, IIO_AD7091R);
-static bool ad7091r_writeable_reg(struct device *dev, unsigned int reg)
+bool ad7091r_writeable_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
case AD7091R_REG_RESULT:
@@ -280,8 +272,9 @@ static bool ad7091r_writeable_reg(struct device *dev, unsigned int reg)
return true;
}
}
+EXPORT_SYMBOL_NS_GPL(ad7091r_writeable_reg, IIO_AD7091R);
-static bool ad7091r_volatile_reg(struct device *dev, unsigned int reg)
+bool ad7091r_volatile_reg(struct device *dev, unsigned int reg)
{
switch (reg) {
case AD7091R_REG_RESULT:
@@ -291,6 +284,7 @@ static bool ad7091r_volatile_reg(struct device *dev, unsigned int reg)
return false;
}
}
+EXPORT_SYMBOL_NS_GPL(ad7091r_volatile_reg, IIO_AD7091R);
const struct regmap_config ad7091r_regmap_config = {
.reg_bits = 8,
diff --git a/drivers/iio/adc/ad7091r-base.h b/drivers/iio/adc/ad7091r-base.h
index 509748aef9b1..2efed8ddc59a 100644
--- a/drivers/iio/adc/ad7091r-base.h
+++ b/drivers/iio/adc/ad7091r-base.h
@@ -8,6 +8,27 @@
#ifndef __DRIVERS_IIO_ADC_AD7091R_BASE_H__
#define __DRIVERS_IIO_ADC_AD7091R_BASE_H__
+#define AD7091R_REG_RESULT 0
+#define AD7091R_REG_CHANNEL 1
+#define AD7091R_REG_CONF 2
+#define AD7091R_REG_ALERT 3
+
+#define AD7091R_REG_CH_LOW_LIMIT(ch) ((ch) * 3 + 4)
+#define AD7091R_REG_CH_HIGH_LIMIT(ch) ((ch) * 3 + 5)
+#define AD7091R_REG_CH_HYSTERESIS(ch) ((ch) * 3 + 6)
+
+#define AD7091R_CHANNEL(idx, bits, ev, num_ev) { \
+ .type = IIO_VOLTAGE, \
+ .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
+ .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
+ .indexed = 1, \
+ .channel = idx, \
+ .event_spec = ev, \
+ .num_event_specs = num_ev, \
+ .scan_type.storagebits = 16, \
+ .scan_type.realbits = bits, \
+}
+
struct device;
struct ad7091r_state;
@@ -17,10 +38,34 @@ struct ad7091r_chip_info {
unsigned int vref_mV;
};
+static const struct iio_event_spec ad7091r_events[] = {
+ {
+ .type = IIO_EV_TYPE_THRESH,
+ .dir = IIO_EV_DIR_RISING,
+ .mask_separate = BIT(IIO_EV_INFO_VALUE) |
+ BIT(IIO_EV_INFO_ENABLE),
+ },
+ {
+ .type = IIO_EV_TYPE_THRESH,
+ .dir = IIO_EV_DIR_FALLING,
+ .mask_separate = BIT(IIO_EV_INFO_VALUE) |
+ BIT(IIO_EV_INFO_ENABLE),
+ },
+ {
+ .type = IIO_EV_TYPE_THRESH,
+ .dir = IIO_EV_DIR_EITHER,
+ .mask_separate = BIT(IIO_EV_INFO_HYSTERESIS),
+ },
+};
+
extern const struct regmap_config ad7091r_regmap_config;
int ad7091r_probe(struct device *dev, const char *name,
const struct ad7091r_chip_info *chip_info,
struct regmap *map, int irq);
+bool ad7091r_volatile_reg(struct device *dev, unsigned int reg);
+
+bool ad7091r_writeable_reg(struct device *dev, unsigned int reg);
+
#endif /* __DRIVERS_IIO_ADC_AD7091R_BASE_H__ */
diff --git a/drivers/iio/adc/ad7091r5.c b/drivers/iio/adc/ad7091r5.c
index 2f048527b7b7..9d3ccfca94ec 100644
--- a/drivers/iio/adc/ad7091r5.c
+++ b/drivers/iio/adc/ad7091r5.c
@@ -12,42 +12,11 @@
#include "ad7091r-base.h"
-static const struct iio_event_spec ad7091r5_events[] = {
- {
- .type = IIO_EV_TYPE_THRESH,
- .dir = IIO_EV_DIR_RISING,
- .mask_separate = BIT(IIO_EV_INFO_VALUE) |
- BIT(IIO_EV_INFO_ENABLE),
- },
- {
- .type = IIO_EV_TYPE_THRESH,
- .dir = IIO_EV_DIR_FALLING,
- .mask_separate = BIT(IIO_EV_INFO_VALUE) |
- BIT(IIO_EV_INFO_ENABLE),
- },
- {
- .type = IIO_EV_TYPE_THRESH,
- .dir = IIO_EV_DIR_EITHER,
- .mask_separate = BIT(IIO_EV_INFO_HYSTERESIS),
- },
-};
-
-#define AD7091R_CHANNEL(idx, bits, ev, num_ev) { \
- .type = IIO_VOLTAGE, \
- .info_mask_separate = BIT(IIO_CHAN_INFO_RAW), \
- .info_mask_shared_by_type = BIT(IIO_CHAN_INFO_SCALE), \
- .indexed = 1, \
- .channel = idx, \
- .event_spec = ev, \
- .num_event_specs = num_ev, \
- .scan_type.storagebits = 16, \
- .scan_type.realbits = bits, \
-}
static const struct iio_chan_spec ad7091r5_channels_irq[] = {
- AD7091R_CHANNEL(0, 12, ad7091r5_events, ARRAY_SIZE(ad7091r5_events)),
- AD7091R_CHANNEL(1, 12, ad7091r5_events, ARRAY_SIZE(ad7091r5_events)),
- AD7091R_CHANNEL(2, 12, ad7091r5_events, ARRAY_SIZE(ad7091r5_events)),
- AD7091R_CHANNEL(3, 12, ad7091r5_events, ARRAY_SIZE(ad7091r5_events)),
+ AD7091R_CHANNEL(0, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(1, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(2, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(3, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
};
static const struct iio_chan_spec ad7091r5_channels_noirq[] = {
--
2.42.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 3/7] iio: adc: ad7091r: Move defines to header file
2023-11-21 21:35 ` [PATCH 3/7] iio: adc: ad7091r: Move defines to header file marcelo.schmitt
@ 2023-11-22 12:40 ` kernel test robot
0 siblings, 0 replies; 13+ messages in thread
From: kernel test robot @ 2023-11-22 12:40 UTC (permalink / raw)
To: marcelo.schmitt@analog.com, beniamin.bia, paul.cercueil,
Michael.Hennerich, lars, jic23, marcelo.schmitt1
Cc: oe-kbuild-all, Marcelo Schmitt, linux-iio, linux-kernel
Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on linus/master v6.7-rc2 next-20231122]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/marcelo-schmitt-analog-com/MAINTAINERS-Add-MAINTAINERS-entry-for-AD7091R/20231122-093706
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
patch link: https://lore.kernel.org/r/8aa859817e86408733a81cf31b932f0efa273c71.1700595310.git.marcelo.schmitt1%40gmail.com
patch subject: [PATCH 3/7] iio: adc: ad7091r: Move defines to header file
config: powerpc-randconfig-r071-20231122 (https://download.01.org/0day-ci/archive/20231122/202311221730.lHHfx8Ft-lkp@intel.com/config)
compiler: powerpc-linux-gcc (GCC) 13.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20231122/202311221730.lHHfx8Ft-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202311221730.lHHfx8Ft-lkp@intel.com/
All warnings (new ones prefixed by >>):
In file included from drivers/iio/adc/ad7091r-base.c:16:
>> drivers/iio/adc/ad7091r-base.h:41:36: warning: 'ad7091r_events' defined but not used [-Wunused-const-variable=]
41 | static const struct iio_event_spec ad7091r_events[] = {
| ^~~~~~~~~~~~~~
vim +/ad7091r_events +41 drivers/iio/adc/ad7091r-base.h
40
> 41 static const struct iio_event_spec ad7091r_events[] = {
42 {
43 .type = IIO_EV_TYPE_THRESH,
44 .dir = IIO_EV_DIR_RISING,
45 .mask_separate = BIT(IIO_EV_INFO_VALUE) |
46 BIT(IIO_EV_INFO_ENABLE),
47 },
48 {
49 .type = IIO_EV_TYPE_THRESH,
50 .dir = IIO_EV_DIR_FALLING,
51 .mask_separate = BIT(IIO_EV_INFO_VALUE) |
52 BIT(IIO_EV_INFO_ENABLE),
53 },
54 {
55 .type = IIO_EV_TYPE_THRESH,
56 .dir = IIO_EV_DIR_EITHER,
57 .mask_separate = BIT(IIO_EV_INFO_HYSTERESIS),
58 },
59 };
60
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 4/7] iio: adc: ad7091r: Alloc IIO device before generic probe
2023-11-21 21:33 [PATCH 0/7] Add support for AD7091R-2/-4/-8 marcelo.schmitt
` (2 preceding siblings ...)
2023-11-21 21:35 ` [PATCH 3/7] iio: adc: ad7091r: Move defines to header file marcelo.schmitt
@ 2023-11-21 21:35 ` marcelo.schmitt
2023-11-21 21:36 ` [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8 marcelo.schmitt
` (2 subsequent siblings)
6 siblings, 0 replies; 13+ messages in thread
From: marcelo.schmitt @ 2023-11-21 21:35 UTC (permalink / raw)
To: beniamin.bia, paul.cercueil, Michael.Hennerich, lars, jic23,
marcelo.schmitt1
Cc: Marcelo Schmitt, linux-iio, linux-kernel
From: Marcelo Schmitt <marcelo.schmitt@analog.com>
Rework ad7091r probe functions so the IIO device is allocated before
the generic device probe function is called.
This change is needed for a follow up patch that passes a pointer to the
IIO device to a couple of regmap callback functions.
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
---
drivers/iio/adc/ad7091r-base.c | 35 +++++++---------------------------
drivers/iio/adc/ad7091r-base.h | 22 +++++++++++++++++----
drivers/iio/adc/ad7091r5.c | 14 ++++++++++++--
3 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/drivers/iio/adc/ad7091r-base.c b/drivers/iio/adc/ad7091r-base.c
index ebf1c8cca25c..69cb5ccdbc49 100644
--- a/drivers/iio/adc/ad7091r-base.c
+++ b/drivers/iio/adc/ad7091r-base.c
@@ -27,21 +27,6 @@
#define AD7091R_REG_CONF_MODE_MASK \
(AD7091R_REG_CONF_AUTO | AD7091R_REG_CONF_CMD)
-enum ad7091r_mode {
- AD7091R_MODE_SAMPLE,
- AD7091R_MODE_COMMAND,
- AD7091R_MODE_AUTOCYCLE,
-};
-
-struct ad7091r_state {
- struct device *dev;
- struct regmap *map;
- struct regulator *vref;
- const struct ad7091r_chip_info *chip_info;
- enum ad7091r_mode mode;
- struct mutex lock; /*lock to prevent concurent reads */
-};
-
static int ad7091r_set_mode(struct ad7091r_state *st, enum ad7091r_mode mode)
{
int ret, conf;
@@ -200,20 +185,14 @@ static void ad7091r_remove(void *data)
regulator_disable(st->vref);
}
-int ad7091r_probe(struct device *dev, const char *name,
- const struct ad7091r_chip_info *chip_info,
- struct regmap *map, int irq)
+int ad7091r_probe(struct iio_dev *iio_dev, const char *name,
+ const struct ad7091r_chip_info *chip_info,
+ struct regmap *map, int irq)
{
- struct iio_dev *iio_dev;
struct ad7091r_state *st;
int ret;
- iio_dev = devm_iio_device_alloc(dev, sizeof(*st));
- if (!iio_dev)
- return -ENOMEM;
-
st = iio_priv(iio_dev);
- st->dev = dev;
st->chip_info = chip_info;
st->map = map;
@@ -231,7 +210,7 @@ int ad7091r_probe(struct device *dev, const char *name,
return ret;
dev_set_drvdata(st->dev, iio_dev);
- ret = devm_request_threaded_irq(dev, irq, NULL,
+ ret = devm_request_threaded_irq(st->dev, irq, NULL,
ad7091r_event_handler,
IRQF_TRIGGER_FALLING |
IRQF_ONESHOT, name, st);
@@ -239,7 +218,7 @@ int ad7091r_probe(struct device *dev, const char *name,
return ret;
}
- st->vref = devm_regulator_get_optional(dev, "vref");
+ st->vref = devm_regulator_get_optional(st->dev, "vref");
if (IS_ERR(st->vref)) {
if (PTR_ERR(st->vref) == -EPROBE_DEFER)
return -EPROBE_DEFER;
@@ -248,7 +227,7 @@ int ad7091r_probe(struct device *dev, const char *name,
ret = regulator_enable(st->vref);
if (ret)
return ret;
- ret = devm_add_action_or_reset(dev, ad7091r_remove, st);
+ ret = devm_add_action_or_reset(st->dev, ad7091r_remove, st);
if (ret)
return ret;
}
@@ -258,7 +237,7 @@ int ad7091r_probe(struct device *dev, const char *name,
if (ret)
return ret;
- return devm_iio_device_register(dev, iio_dev);
+ return devm_iio_device_register(st->dev, iio_dev);
}
EXPORT_SYMBOL_NS_GPL(ad7091r_probe, IIO_AD7091R);
diff --git a/drivers/iio/adc/ad7091r-base.h b/drivers/iio/adc/ad7091r-base.h
index 2efed8ddc59a..405939f4eee0 100644
--- a/drivers/iio/adc/ad7091r-base.h
+++ b/drivers/iio/adc/ad7091r-base.h
@@ -30,7 +30,21 @@
}
struct device;
-struct ad7091r_state;
+
+enum ad7091r_mode {
+ AD7091R_MODE_SAMPLE,
+ AD7091R_MODE_COMMAND,
+ AD7091R_MODE_AUTOCYCLE,
+};
+
+struct ad7091r_state {
+ struct device *dev;
+ struct regmap *map;
+ struct regulator *vref;
+ const struct ad7091r_chip_info *chip_info;
+ enum ad7091r_mode mode;
+ struct mutex lock; /*lock to prevent concurent reads */
+};
struct ad7091r_chip_info {
unsigned int num_channels;
@@ -60,9 +74,9 @@ static const struct iio_event_spec ad7091r_events[] = {
extern const struct regmap_config ad7091r_regmap_config;
-int ad7091r_probe(struct device *dev, const char *name,
- const struct ad7091r_chip_info *chip_info,
- struct regmap *map, int irq);
+int ad7091r_probe(struct iio_dev *iio_dev, const char *name,
+ const struct ad7091r_chip_info *chip_info,
+ struct regmap *map, int irq);
bool ad7091r_volatile_reg(struct device *dev, unsigned int reg);
diff --git a/drivers/iio/adc/ad7091r5.c b/drivers/iio/adc/ad7091r5.c
index 9d3ccfca94ec..1a27841d1bbc 100644
--- a/drivers/iio/adc/ad7091r5.c
+++ b/drivers/iio/adc/ad7091r5.c
@@ -42,8 +42,18 @@ static int ad7091r5_i2c_probe(struct i2c_client *i2c)
{
const struct i2c_device_id *id = i2c_client_get_device_id(i2c);
const struct ad7091r_chip_info *chip_info;
- struct regmap *map = devm_regmap_init_i2c(i2c, &ad7091r_regmap_config);
+ struct ad7091r_state *st;
+ struct iio_dev *iio_dev;
+ struct regmap *map;
+ iio_dev = devm_iio_device_alloc(&i2c->dev, sizeof(*st));
+ if (!iio_dev)
+ return -ENOMEM;
+
+ st = iio_priv(iio_dev);
+ st->dev = &i2c->dev;
+
+ map = devm_regmap_init_i2c(i2c, &ad7091r_regmap_config);
if (IS_ERR(map))
return PTR_ERR(map);
@@ -52,7 +62,7 @@ static int ad7091r5_i2c_probe(struct i2c_client *i2c)
else
chip_info = &ad7091r5_chip_info_noirq;
- return ad7091r_probe(&i2c->dev, id->name, chip_info, map, i2c->irq);
+ return ad7091r_probe(iio_dev, id->name, chip_info, map, i2c->irq);
}
static const struct of_device_id ad7091r5_dt_ids[] = {
--
2.42.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8
2023-11-21 21:33 [PATCH 0/7] Add support for AD7091R-2/-4/-8 marcelo.schmitt
` (3 preceding siblings ...)
2023-11-21 21:35 ` [PATCH 4/7] iio: adc: ad7091r: Alloc IIO device before generic probe marcelo.schmitt
@ 2023-11-21 21:36 ` marcelo.schmitt
2023-11-22 9:57 ` Krzysztof Kozlowski
2023-11-22 12:40 ` kernel test robot
2023-11-21 21:36 ` [PATCH 6/7] iio: adc: Add support " marcelo.schmitt
2023-11-21 21:36 ` [PATCH 7/7] iio: adc: ad7091r-base: Add debugfs reg access marcelo.schmitt
6 siblings, 2 replies; 13+ messages in thread
From: marcelo.schmitt @ 2023-11-21 21:36 UTC (permalink / raw)
To: beniamin.bia, paul.cercueil, Michael.Hennerich, lars, jic23,
marcelo.schmitt1
Cc: Marcelo Schmitt, linux-iio, linux-kernel
From: Marcelo Schmitt <marcelo.schmitt@analog.com>
Add device tree binding documentation for AD7091R-8.
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
---
.../bindings/iio/adc/adi,ad7091r8.yaml | 101 ++++++++++++++++++
MAINTAINERS | 1 +
2 files changed, 102 insertions(+)
create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
new file mode 100644
index 000000000000..f10b6727737f
--- /dev/null
+++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
@@ -0,0 +1,101 @@
+# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/iio/adc/adi,ad7091r8.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Analog Devices AD7091R8 8-Channel 12-Bit ADC
+
+maintainers:
+ - Marcelo Schmitt <marcelo.schmitt@analog.com>
+
+description: |
+ Analog Devices AD7091R-8 8-Channel 12-Bit ADC
+ https://www.analog.com/media/en/technical-documentation/data-sheets/AD7091R-2_7091R-4_7091R-8.pdf
+
+properties:
+ compatible:
+ enum:
+ - adi,ad7091r2
+ - adi,ad7091r4
+ - adi,ad7091r8
+
+ reg:
+ maxItems: 1
+
+ vref-supply: true
+
+ spi-max-frequency: true
+
+ adi,conversion-start-gpios:
+ description:
+ Device tree identifier of the CONVST pin.
+ This logic input is used to initiate conversions on the analog
+ input channels.
+ maxItems: 1
+
+ reset-gpios:
+ maxItems: 1
+
+ interrupts:
+ maxItems: 1
+
+required:
+ - compatible
+ - reg
+ - adi,conversion-start-gpios
+
+patternProperties:
+ "^channel@[0-7]$":
+ $ref: "adc.yaml"
+ type: object
+ description: Represents the external channels which are connected to the ADC.
+
+ properties:
+ reg:
+ minimum: 0
+ maximum: 7
+
+ required:
+ - reg
+
+allOf:
+ - $ref: /schemas/spi/spi-peripheral-props.yaml#
+
+ # AD7091R-2 does not have ALERT/BUSY/GPO pin
+ - if:
+ properties:
+ compatible:
+ contains:
+ enum:
+ - adi,ad7091r4
+ - adi,ad7091r8
+ then:
+ properties:
+ interrupts: true
+ else:
+ properties:
+ interrupts: false
+
+unevaluatedProperties: false
+
+examples:
+ - |
+ #include <dt-bindings/interrupt-controller/irq.h>
+ #include <dt-bindings/gpio/gpio.h>
+ spi {
+ #address-cells = <1>;
+ #size-cells = <0>;
+
+ adc@0 {
+ compatible = "adi,ad7091r8";
+ reg = <0x0>;
+ spi-max-frequency = <45454545>;
+ vref-supply = <&adc_vref>;
+ adi,conversion-start-gpios = <&gpio 25 GPIO_ACTIVE_LOW>;
+ reset-gpios = <&gpio 27 GPIO_ACTIVE_LOW>;
+ interrupts = <22 IRQ_TYPE_EDGE_FALLING>;
+ interrupt-parent = <&gpio>;
+ };
+ };
+...
diff --git a/MAINTAINERS b/MAINTAINERS
index 008f0e73bead..6e7c6c866396 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1132,6 +1132,7 @@ L: linux-iio@vger.kernel.org
S: Supported
W: http://ez.analog.com/community/linux-device-drivers
F: Documentation/devicetree/bindings/iio/adc/adi,ad7091r5.yaml
+F: Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
F: drivers/iio/adc/drivers/iio/adc/ad7091r-base.c
F: drivers/iio/adc/drivers/iio/adc/ad7091r-base.h
F: drivers/iio/adc/drivers/iio/adc/ad7091r5.c
--
2.42.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8
2023-11-21 21:36 ` [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8 marcelo.schmitt
@ 2023-11-22 9:57 ` Krzysztof Kozlowski
2023-11-22 12:40 ` kernel test robot
1 sibling, 0 replies; 13+ messages in thread
From: Krzysztof Kozlowski @ 2023-11-22 9:57 UTC (permalink / raw)
To: marcelo.schmitt, beniamin.bia, paul.cercueil, Michael.Hennerich,
lars, jic23, marcelo.schmitt1
Cc: linux-iio, linux-kernel
On 21/11/2023 22:36, marcelo.schmitt@analog.com wrote:
> From: Marcelo Schmitt <marcelo.schmitt@analog.com>
>
> Add device tree binding documentation for AD7091R-8.
Please use scripts/get_maintainers.pl to get a list of necessary people
and lists to CC. It might happen, that command when run on an older
kernel, gives you outdated entries. Therefore please be sure you base
your patches on recent Linux kernel.
You missed at least devicetree list (maybe more), so this won't be
tested by automated tooling. Performing review on untested code might be
a waste of time, thus I will skip this patch entirely till you follow
the process allowing the patch to be tested.
Please kindly resend and include all necessary To/Cc entries.
>
> Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
> ---
> .../bindings/iio/adc/adi,ad7091r8.yaml | 101 ++++++++++++++++++
> MAINTAINERS | 1 +
> 2 files changed, 102 insertions(+)
> create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
>
> diff --git a/Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml b/Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
> new file mode 100644
> index 000000000000..f10b6727737f
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
> @@ -0,0 +1,101 @@
> +# SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/iio/adc/adi,ad7091r8.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Analog Devices AD7091R8 8-Channel 12-Bit ADC
> +
> +maintainers:
> + - Marcelo Schmitt <marcelo.schmitt@analog.com>
> +
> +description: |
> + Analog Devices AD7091R-8 8-Channel 12-Bit ADC
> + https://www.analog.com/media/en/technical-documentation/data-sheets/AD7091R-2_7091R-4_7091R-8.pdf
> +
> +properties:
> + compatible:
> + enum:
> + - adi,ad7091r2
> + - adi,ad7091r4
> + - adi,ad7091r8
> +
> + reg:
> + maxItems: 1
> +
> + vref-supply: true
> +
> + spi-max-frequency: true
> +
> + adi,conversion-start-gpios:
> + description:
> + Device tree identifier of the CONVST pin.
> + This logic input is used to initiate conversions on the analog
> + input channels.
> + maxItems: 1
> +
> + reset-gpios:
> + maxItems: 1
> +
> + interrupts:
> + maxItems: 1
> +
> +required:
This goes after pattern.
> + - compatible
> + - reg
> + - adi,conversion-start-gpios
> +
> +patternProperties:
> + "^channel@[0-7]$":
> + $ref: "adc.yaml"
You never tested this... considering that you opted-out of automated
testing, you basically send buggy code. NAK.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8
2023-11-21 21:36 ` [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8 marcelo.schmitt
2023-11-22 9:57 ` Krzysztof Kozlowski
@ 2023-11-22 12:40 ` kernel test robot
1 sibling, 0 replies; 13+ messages in thread
From: kernel test robot @ 2023-11-22 12:40 UTC (permalink / raw)
To: marcelo.schmitt@analog.com, beniamin.bia, paul.cercueil,
Michael.Hennerich, lars, jic23, marcelo.schmitt1
Cc: oe-kbuild-all, Marcelo Schmitt, linux-iio, linux-kernel
Hi,
kernel test robot noticed the following build warnings:
[auto build test WARNING on jic23-iio/togreg]
[also build test WARNING on linus/master v6.7-rc2 next-20231122]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/marcelo-schmitt-analog-com/MAINTAINERS-Add-MAINTAINERS-entry-for-AD7091R/20231122-093706
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
patch link: https://lore.kernel.org/r/566503a54feba35178c778a7929bced66ebd8870.1700595310.git.marcelo.schmitt1%40gmail.com
patch subject: [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8
compiler: loongarch64-linux-gcc (GCC) 13.2.0
reproduce: (https://download.01.org/0day-ci/archive/20231122/202311221707.P5KpelyW-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202311221707.P5KpelyW-lkp@intel.com/
dtcheck warnings: (new ones prefixed by >>)
>> Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml:50:11: [error] string value is redundantly quoted with any quotes (quoted-strings)
vim +50 Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
8
9 maintainers:
10 - Marcelo Schmitt <marcelo.schmitt@analog.com>
11
12 description: |
13 Analog Devices AD7091R-8 8-Channel 12-Bit ADC
14 https://www.analog.com/media/en/technical-documentation/data-sheets/AD7091R-2_7091R-4_7091R-8.pdf
15
16 properties:
17 compatible:
18 enum:
19 - adi,ad7091r2
20 - adi,ad7091r4
21 - adi,ad7091r8
22
23 reg:
24 maxItems: 1
25
26 vref-supply: true
27
28 spi-max-frequency: true
29
30 adi,conversion-start-gpios:
31 description:
32 Device tree identifier of the CONVST pin.
33 This logic input is used to initiate conversions on the analog
34 input channels.
35 maxItems: 1
36
37 reset-gpios:
38 maxItems: 1
39
40 interrupts:
41 maxItems: 1
42
43 required:
44 - compatible
45 - reg
46 - adi,conversion-start-gpios
47
48 patternProperties:
49 "^channel@[0-7]$":
> 50 $ref: "adc.yaml"
51 type: object
52 description: Represents the external channels which are connected to the ADC.
53
54 properties:
55 reg:
56 minimum: 0
57 maximum: 7
58
59 required:
60 - reg
61
62 allOf:
63 - $ref: /schemas/spi/spi-peripheral-props.yaml#
64
65 # AD7091R-2 does not have ALERT/BUSY/GPO pin
66 - if:
67 properties:
68 compatible:
69 contains:
70 enum:
71 - adi,ad7091r4
72 - adi,ad7091r8
73 then:
74 properties:
75 interrupts: true
76 else:
77 properties:
78 interrupts: false
79
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 6/7] iio: adc: Add support for AD7091R-8
2023-11-21 21:33 [PATCH 0/7] Add support for AD7091R-2/-4/-8 marcelo.schmitt
` (4 preceding siblings ...)
2023-11-21 21:36 ` [PATCH 5/7] dt-bindings: iio: Add binding documentation for AD7091R-8 marcelo.schmitt
@ 2023-11-21 21:36 ` marcelo.schmitt
2023-11-22 10:01 ` Krzysztof Kozlowski
2023-11-23 6:30 ` Dan Carpenter
2023-11-21 21:36 ` [PATCH 7/7] iio: adc: ad7091r-base: Add debugfs reg access marcelo.schmitt
6 siblings, 2 replies; 13+ messages in thread
From: marcelo.schmitt @ 2023-11-21 21:36 UTC (permalink / raw)
To: beniamin.bia, paul.cercueil, Michael.Hennerich, lars, jic23,
marcelo.schmitt1
Cc: Marcelo Schmitt, linux-iio, linux-kernel
From: Marcelo Schmitt <marcelo.schmitt@analog.com>
Add support for Analog Devices AD7091R-2, AD7091R-4, and AD7091R-8
low power 12-Bit SAR ADCs.
Extend ad7091r-base driver so it can be used by AD7091R-8 drivers.
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
---
Device read/write might look odd due to the transfer protocol for these devices.
I'm glad to hear any suggestions on how to make it better.
MAINTAINERS | 1 +
drivers/iio/adc/Kconfig | 16 ++
drivers/iio/adc/Makefile | 4 +-
drivers/iio/adc/ad7091r-base.c | 25 ++-
drivers/iio/adc/ad7091r-base.h | 15 ++
drivers/iio/adc/ad7091r5.c | 2 +
drivers/iio/adc/ad7091r8.c | 272 +++++++++++++++++++++++++++++++++
7 files changed, 327 insertions(+), 8 deletions(-)
create mode 100644 drivers/iio/adc/ad7091r8.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 6e7c6c866396..54eff6f0c358 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1136,6 +1136,7 @@ F: Documentation/devicetree/bindings/iio/adc/adi,ad7091r8.yaml
F: drivers/iio/adc/drivers/iio/adc/ad7091r-base.c
F: drivers/iio/adc/drivers/iio/adc/ad7091r-base.h
F: drivers/iio/adc/drivers/iio/adc/ad7091r5.c
+F: drivers/iio/adc/drivers/iio/adc/ad7091r8.c
ANALOG DEVICES INC AD7192 DRIVER
M: Alexandru Tachici <alexandru.tachici@analog.com>
diff --git a/drivers/iio/adc/Kconfig b/drivers/iio/adc/Kconfig
index 1e2b7a2c67c6..284d898790a2 100644
--- a/drivers/iio/adc/Kconfig
+++ b/drivers/iio/adc/Kconfig
@@ -36,13 +36,29 @@ config AD4130
To compile this driver as a module, choose M here: the module will be
called ad4130.
+config AD7091R
+ tristate
+
config AD7091R5
tristate "Analog Devices AD7091R5 ADC Driver"
depends on I2C
+ select AD7091R
select REGMAP_I2C
help
Say yes here to build support for Analog Devices AD7091R-5 ADC.
+config AD7091R8
+ tristate "Analog Devices AD7091R8 ADC Driver"
+ depends on SPI
+ select AD7091R
+ select REGMAP_SPI
+ help
+ Say yes here to build support for Analog Devices AD7091R-2, AD7091R-4,
+ and AD7091R-8 ADC.
+
+ To compile this driver as a module, choose M here: the module will be
+ called ad7091r8.
+
config AD7124
tristate "Analog Devices AD7124 and similar sigma-delta ADCs driver"
depends on SPI_MASTER
diff --git a/drivers/iio/adc/Makefile b/drivers/iio/adc/Makefile
index c0803383a7cc..d2fda54a3259 100644
--- a/drivers/iio/adc/Makefile
+++ b/drivers/iio/adc/Makefile
@@ -7,7 +7,9 @@
obj-$(CONFIG_AB8500_GPADC) += ab8500-gpadc.o
obj-$(CONFIG_AD_SIGMA_DELTA) += ad_sigma_delta.o
obj-$(CONFIG_AD4130) += ad4130.o
-obj-$(CONFIG_AD7091R5) += ad7091r5.o ad7091r-base.o
+obj-$(CONFIG_AD7091R) += ad7091r-base.o
+obj-$(CONFIG_AD7091R5) += ad7091r5.o
+obj-$(CONFIG_AD7091R8) += ad7091r8.o
obj-$(CONFIG_AD7124) += ad7124.o
obj-$(CONFIG_AD7192) += ad7192.o
obj-$(CONFIG_AD7266) += ad7266.o
diff --git a/drivers/iio/adc/ad7091r-base.c b/drivers/iio/adc/ad7091r-base.c
index 69cb5ccdbc49..f9b4f91d1c4f 100644
--- a/drivers/iio/adc/ad7091r-base.c
+++ b/drivers/iio/adc/ad7091r-base.c
@@ -6,6 +6,7 @@
*/
#include <linux/bitops.h>
+#include <linux/bitfield.h>
#include <linux/iio/events.h>
#include <linux/iio/iio.h>
#include <linux/interrupt.h>
@@ -16,7 +17,8 @@
#include "ad7091r-base.h"
/* AD7091R_REG_RESULT */
-#define AD7091R_REG_RESULT_CH_ID(x) (((x) >> 13) & 0x3)
+#define AD7091R5_REG_RESULT_CH_ID(x) (((x) >> 13) & 0x3)
+#define AD7091R8_REG_RESULT_CH_ID(x) (((x) >> 13) & 0x7)
#define AD7091R_REG_RESULT_CONV_RESULT(x) ((x) & 0xfff)
/* AD7091R_REG_CONF */
@@ -45,10 +47,14 @@ static int ad7091r_set_mode(struct ad7091r_state *st, enum ad7091r_mode mode)
return -EINVAL;
}
- ret = regmap_update_bits(st->map, AD7091R_REG_CONF,
- AD7091R_REG_CONF_MODE_MASK, conf);
- if (ret)
- return ret;
+ /* AD7091R-2/4/8 don't set normal, command, autocycle modes in conf reg */
+ if (st->chip_info->type == AD7091R5) {
+ return 0;
+ ret = regmap_update_bits(st->map, AD7091R_REG_CONF,
+ AD7091R_REG_CONF_MODE_MASK, conf);
+ if (ret)
+ return ret;
+ }
st->mode = mode;
@@ -88,8 +94,13 @@ static int ad7091r_read_one(struct iio_dev *iio_dev,
if (ret)
return ret;
- if (AD7091R_REG_RESULT_CH_ID(val) != channel)
- return -EIO;
+ if (st->chip_info->type == AD7091R5) {
+ if (AD7091R5_REG_RESULT_CH_ID(val) != channel)
+ return -EIO;
+ } else {
+ if (AD7091R8_REG_RESULT_CH_ID(val) != channel)
+ return -EIO;
+ }
*read_val = AD7091R_REG_RESULT_CONV_RESULT(val);
diff --git a/drivers/iio/adc/ad7091r-base.h b/drivers/iio/adc/ad7091r-base.h
index 405939f4eee0..99e5053d1f44 100644
--- a/drivers/iio/adc/ad7091r-base.h
+++ b/drivers/iio/adc/ad7091r-base.h
@@ -29,6 +29,8 @@
.scan_type.realbits = bits, \
}
+#include <linux/gpio/consumer.h>
+
struct device;
enum ad7091r_mode {
@@ -40,13 +42,26 @@ enum ad7091r_mode {
struct ad7091r_state {
struct device *dev;
struct regmap *map;
+ struct gpio_desc *convst_gpio;
+ struct gpio_desc *reset_gpio;
struct regulator *vref;
const struct ad7091r_chip_info *chip_info;
enum ad7091r_mode mode;
struct mutex lock; /*lock to prevent concurent reads */
+ __be16 tx_buf __aligned(IIO_DMA_MINALIGN);
+ __be16 rx_buf;
+};
+
+enum ad7091r_device_type {
+ AD7091R2,
+ AD7091R4,
+ AD7091R5,
+ AD7091R8,
};
struct ad7091r_chip_info {
+ const char *name;
+ enum ad7091r_device_type type;
unsigned int num_channels;
const struct iio_chan_spec *channels;
unsigned int vref_mV;
diff --git a/drivers/iio/adc/ad7091r5.c b/drivers/iio/adc/ad7091r5.c
index 1a27841d1bbc..5f587e0b55df 100644
--- a/drivers/iio/adc/ad7091r5.c
+++ b/drivers/iio/adc/ad7091r5.c
@@ -27,12 +27,14 @@ static const struct iio_chan_spec ad7091r5_channels_noirq[] = {
};
static const struct ad7091r_chip_info ad7091r5_chip_info_irq = {
+ .type = AD7091R5,
.channels = ad7091r5_channels_irq,
.num_channels = ARRAY_SIZE(ad7091r5_channels_irq),
.vref_mV = 2500,
};
static const struct ad7091r_chip_info ad7091r5_chip_info_noirq = {
+ .type = AD7091R5,
.channels = ad7091r5_channels_noirq,
.num_channels = ARRAY_SIZE(ad7091r5_channels_noirq),
.vref_mV = 2500,
diff --git a/drivers/iio/adc/ad7091r8.c b/drivers/iio/adc/ad7091r8.c
new file mode 100644
index 000000000000..806d858d4c0e
--- /dev/null
+++ b/drivers/iio/adc/ad7091r8.c
@@ -0,0 +1,272 @@
+// SPDX-License-Identifier: GPL-2.0
+/*
+ * Analog Devices AD7091R8 12-bit SAR ADC driver
+ *
+ * Copyright 2023 Analog Devices Inc.
+ */
+
+#include <linux/bitfield.h>
+#include <linux/iio/iio.h>
+#include <linux/module.h>
+#include <linux/regmap.h>
+#include <linux/gpio/consumer.h>
+#include <linux/spi/spi.h>
+
+#include "ad7091r-base.h"
+
+#define AD7091R8_REG_ADDR_MSK GENMASK(15, 11)
+#define AD7091R8_RD_WR_FLAG_MSK BIT(10)
+#define AD7091R8_REG_DATA_MSK GENMASK(9, 0)
+
+#define AD7091R2_DEV_NAME "ad7091r-2"
+#define AD7091R4_DEV_NAME "ad7091r-4"
+#define AD7091R8_DEV_NAME "ad7091r-8"
+
+#define AD7091R_SPI_CHIP_INFO(n) { \
+ .name = AD7091R##n##_DEV_NAME, \
+ .type = AD7091R##n, \
+ .channels = ad7091r##n##_channels, \
+ .num_channels = ARRAY_SIZE(ad7091r##n##_channels), \
+ .vref_mV = 2500, \
+}
+
+#define AD7091R_SPI_CHIP_INFO_IRQ(n) { \
+ .name = AD7091R##n##_DEV_NAME, \
+ .type = AD7091R##n, \
+ .channels = ad7091r##n##_channels_irq, \
+ .num_channels = ARRAY_SIZE(ad7091r##n##_channels_irq), \
+ .vref_mV = 2500, \
+}
+
+static const struct iio_chan_spec ad7091r2_channels[] = {
+ AD7091R_CHANNEL(0, 12, NULL, 0),
+ AD7091R_CHANNEL(1, 12, NULL, 0),
+};
+
+static const struct iio_chan_spec ad7091r4_channels[] = {
+ AD7091R_CHANNEL(0, 12, NULL, 0),
+ AD7091R_CHANNEL(1, 12, NULL, 0),
+ AD7091R_CHANNEL(2, 12, NULL, 0),
+ AD7091R_CHANNEL(3, 12, NULL, 0),
+};
+
+static const struct iio_chan_spec ad7091r4_channels_irq[] = {
+ AD7091R_CHANNEL(0, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(1, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(2, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(3, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+};
+
+static const struct iio_chan_spec ad7091r8_channels[] = {
+ AD7091R_CHANNEL(0, 12, NULL, 0),
+ AD7091R_CHANNEL(1, 12, NULL, 0),
+ AD7091R_CHANNEL(2, 12, NULL, 0),
+ AD7091R_CHANNEL(3, 12, NULL, 0),
+ AD7091R_CHANNEL(4, 12, NULL, 0),
+ AD7091R_CHANNEL(5, 12, NULL, 0),
+ AD7091R_CHANNEL(6, 12, NULL, 0),
+ AD7091R_CHANNEL(7, 12, NULL, 0),
+};
+
+static const struct iio_chan_spec ad7091r8_channels_irq[] = {
+ AD7091R_CHANNEL(0, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(1, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(2, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(3, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(4, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(5, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(6, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+ AD7091R_CHANNEL(7, 12, ad7091r_events, ARRAY_SIZE(ad7091r_events)),
+};
+
+static const struct ad7091r_chip_info ad7091r_spi_chip_info[] = {
+ [AD7091R2] = AD7091R_SPI_CHIP_INFO(2),
+ [AD7091R4] = AD7091R_SPI_CHIP_INFO(4),
+ [AD7091R8] = AD7091R_SPI_CHIP_INFO(8),
+};
+
+static const struct ad7091r_chip_info ad7091r_spi_chip_info_irq[] = {
+ [AD7091R4] = AD7091R_SPI_CHIP_INFO_IRQ(4),
+ [AD7091R8] = AD7091R_SPI_CHIP_INFO_IRQ(8),
+};
+
+static void ad7091r_pulse_convst(struct ad7091r_state *st)
+{
+ gpiod_set_value_cansleep(st->convst_gpio, 1);
+ gpiod_set_value_cansleep(st->convst_gpio, 0);
+}
+
+static const struct regmap_config ad7091r_spi_regmap_config[] = {
+ [AD7091R2] = {
+ .reg_bits = 5,
+ .pad_bits = 3,
+ .val_bits = 16,
+ .volatile_reg = ad7091r_volatile_reg,
+ .writeable_reg = ad7091r_writeable_reg,
+ .max_register = AD7091R_REG_CH_HYSTERESIS(2),
+ },
+ [AD7091R4] = {
+ .reg_bits = 5,
+ .pad_bits = 3,
+ .val_bits = 16,
+ .volatile_reg = ad7091r_volatile_reg,
+ .writeable_reg = ad7091r_writeable_reg,
+ .max_register = AD7091R_REG_CH_HYSTERESIS(4),
+ },
+ [AD7091R8] = {
+ .reg_bits = 5,
+ .pad_bits = 3,
+ .write_flag_mask = BIT(2),
+ .val_bits = 16,
+ .volatile_reg = ad7091r_volatile_reg,
+ .writeable_reg = ad7091r_writeable_reg,
+ .max_register = AD7091R_REG_CH_HYSTERESIS(8),
+ },
+};
+
+static int ad7091r_regmap_bus_reg_read(void *context, unsigned int reg,
+ unsigned int *val)
+{
+ struct ad7091r_state *st = context;
+ struct spi_device *spi = container_of(st->dev, struct spi_device, dev);
+ const struct regmap_config *conf = &ad7091r_spi_regmap_config[st->chip_info->type];
+ int ret;
+
+ struct spi_transfer t[] = {
+ {
+ .tx_buf = &st->tx_buf,
+ .len = 2,
+ .cs_change = 1,
+ }, {
+ .rx_buf = &st->rx_buf,
+ .len = 2,
+ }
+ };
+
+ if (reg == AD7091R_REG_RESULT)
+ ad7091r_pulse_convst(st);
+
+ reg <<= conf->pad_bits;
+ st->tx_buf = cpu_to_be16(reg << 8);
+
+ ret = spi_sync_transfer(spi, t, ARRAY_SIZE(t));
+ if (ret < 0)
+ return ret;
+
+ *val = be16_to_cpu(st->rx_buf);
+ return 0;
+}
+
+static int ad7091r_regmap_bus_reg_write(void *context, unsigned int reg,
+ unsigned int val)
+{
+ struct ad7091r_state *st = context;
+ struct spi_device *spi = container_of(st->dev, struct spi_device, dev);
+
+ /*
+ * AD7091R-2/-4/-8 protocol (datasheet page 31) is to do a single SPI
+ * transfer with reg address set in bits B15:B11 and value set in B9:B0.
+ */
+ st->tx_buf = cpu_to_be16(FIELD_PREP(AD7091R8_REG_DATA_MSK, val) |
+ FIELD_PREP(AD7091R8_RD_WR_FLAG_MSK, 1) |
+ FIELD_PREP(AD7091R8_REG_ADDR_MSK, reg));
+
+ return spi_write(spi, &st->tx_buf, 2);
+}
+
+static struct regmap_bus ad7091r8_regmap_bus = {
+ .reg_read = ad7091r_regmap_bus_reg_read,
+ .reg_write = ad7091r_regmap_bus_reg_write,
+ .reg_format_endian_default = REGMAP_ENDIAN_BIG,
+ .val_format_endian_default = REGMAP_ENDIAN_BIG,
+};
+
+static int ad7091r8_gpio_setup(struct ad7091r_state *st)
+{
+ st->convst_gpio = devm_gpiod_get(st->dev, "adi,conversion-start",
+ GPIOD_OUT_LOW);
+ if (IS_ERR(st->convst_gpio))
+ return dev_err_probe(st->dev, PTR_ERR(st->convst_gpio),
+ "Error getting convst GPIO: %ld\n",
+ PTR_ERR(st->convst_gpio));
+
+ st->reset_gpio = devm_gpiod_get_optional(st->dev, "reset",
+ GPIOD_OUT_HIGH);
+ if (IS_ERR(st->reset_gpio))
+ return PTR_ERR(st->reset_gpio);
+
+ if (st->reset_gpio) {
+ fsleep(20);
+ gpiod_set_value_cansleep(st->reset_gpio, 0);
+ }
+
+ return 0;
+}
+
+static int ad7091r8_spi_probe(struct spi_device *spi)
+{
+ const struct ad7091r_chip_info *chip_info;
+ struct ad7091r_state *st;
+ struct iio_dev *iio_dev;
+ struct regmap *map;
+ int ret;
+
+ chip_info = spi_get_device_match_data(spi);
+ if (!chip_info)
+ return -EINVAL;
+
+ iio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
+ if (!iio_dev)
+ return -ENOMEM;
+
+ st = iio_priv(iio_dev);
+ st->dev = &spi->dev;
+
+ map = devm_regmap_init(&spi->dev, &ad7091r8_regmap_bus, st,
+ &ad7091r_spi_regmap_config[chip_info->type]);
+
+ if (IS_ERR(map))
+ return dev_err_probe(&spi->dev, PTR_ERR(map),
+ "Error initializing spi regmap: %ld\n",
+ PTR_ERR(map));
+
+ ret = ad7091r8_gpio_setup(st);
+ if (ret < 0)
+ return ret;
+
+ if (spi->irq)
+ chip_info = &ad7091r_spi_chip_info_irq[chip_info->type];
+
+ return ad7091r_probe(iio_dev, chip_info->name, chip_info, map, spi->irq);
+}
+
+static const struct of_device_id ad7091r8_of_match[] = {
+ { .compatible = "adi,ad7091r2", .data = &ad7091r_spi_chip_info[AD7091R2] },
+ { .compatible = "adi,ad7091r4", .data = &ad7091r_spi_chip_info[AD7091R4] },
+ { .compatible = "adi,ad7091r8", .data = &ad7091r_spi_chip_info[AD7091R8] },
+ { },
+};
+MODULE_DEVICE_TABLE(of, ad7091r8_of_match);
+
+static const struct spi_device_id ad7091r8_spi_id[] = {
+ { "ad7091r2", (kernel_ulong_t)&ad7091r_spi_chip_info[AD7091R2] },
+ { "ad7091r4", (kernel_ulong_t)&ad7091r_spi_chip_info[AD7091R4] },
+ { "ad7091r8", (kernel_ulong_t)&ad7091r_spi_chip_info[AD7091R8] },
+ { },
+};
+MODULE_DEVICE_TABLE(spi, ad7091r8_spi_id);
+
+static struct spi_driver ad7091r8_driver = {
+ .driver = {
+ .name = "ad7091r8",
+ .of_match_table = ad7091r8_of_match,
+ },
+ .probe = ad7091r8_spi_probe,
+ .id_table = ad7091r8_spi_id,
+};
+module_spi_driver(ad7091r8_driver);
+
+MODULE_AUTHOR("Marcelo Schmitt <marcelo.schmitt@analog.com>");
+MODULE_DESCRIPTION("Analog Devices AD7091R8 ADC driver");
+MODULE_LICENSE("GPL");
+MODULE_IMPORT_NS(IIO_AD7091R);
--
2.42.0
^ permalink raw reply related [flat|nested] 13+ messages in thread* Re: [PATCH 6/7] iio: adc: Add support for AD7091R-8
2023-11-21 21:36 ` [PATCH 6/7] iio: adc: Add support " marcelo.schmitt
@ 2023-11-22 10:01 ` Krzysztof Kozlowski
2023-11-23 6:30 ` Dan Carpenter
1 sibling, 0 replies; 13+ messages in thread
From: Krzysztof Kozlowski @ 2023-11-22 10:01 UTC (permalink / raw)
To: marcelo.schmitt, beniamin.bia, paul.cercueil, Michael.Hennerich,
lars, jic23, marcelo.schmitt1
Cc: linux-iio, linux-kernel
On 21/11/2023 22:36, marcelo.schmitt@analog.com wrote:
> From: Marcelo Schmitt <marcelo.schmitt@analog.com>
>
> Add support for Analog Devices AD7091R-2, AD7091R-4, and AD7091R-8
> low power 12-Bit SAR ADCs.
> Extend ad7091r-base driver so it can be used by AD7091R-8 drivers.
>
> Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
> ---
>
> Device read/write might look odd due to the transfer protocol for these devices.
> I'm glad to hear any suggestions on how to make it better.
>
...
> +
> +static int ad7091r8_gpio_setup(struct ad7091r_state *st)
> +{
> + st->convst_gpio = devm_gpiod_get(st->dev, "adi,conversion-start",
> + GPIOD_OUT_LOW);
> + if (IS_ERR(st->convst_gpio))
> + return dev_err_probe(st->dev, PTR_ERR(st->convst_gpio),
> + "Error getting convst GPIO: %ld\n",
> + PTR_ERR(st->convst_gpio));
Don't print error code twice.
> +
> + st->reset_gpio = devm_gpiod_get_optional(st->dev, "reset",
> + GPIOD_OUT_HIGH);
> + if (IS_ERR(st->reset_gpio))
> + return PTR_ERR(st->reset_gpio);
> +
> + if (st->reset_gpio) {
> + fsleep(20);
> + gpiod_set_value_cansleep(st->reset_gpio, 0);
> + }
> +
> + return 0;
> +}
> +
> +static int ad7091r8_spi_probe(struct spi_device *spi)
> +{
> + const struct ad7091r_chip_info *chip_info;
> + struct ad7091r_state *st;
> + struct iio_dev *iio_dev;
> + struct regmap *map;
> + int ret;
> +
> + chip_info = spi_get_device_match_data(spi);
> + if (!chip_info)
> + return -EINVAL;
> +
> + iio_dev = devm_iio_device_alloc(&spi->dev, sizeof(*st));
> + if (!iio_dev)
> + return -ENOMEM;
> +
> + st = iio_priv(iio_dev);
> + st->dev = &spi->dev;
> +
> + map = devm_regmap_init(&spi->dev, &ad7091r8_regmap_bus, st,
> + &ad7091r_spi_regmap_config[chip_info->type]);
> +
> + if (IS_ERR(map))
> + return dev_err_probe(&spi->dev, PTR_ERR(map),
> + "Error initializing spi regmap: %ld\n",
> + PTR_ERR(map));
Don't print error code twice.
Best regards,
Krzysztof
^ permalink raw reply [flat|nested] 13+ messages in thread* Re: [PATCH 6/7] iio: adc: Add support for AD7091R-8
2023-11-21 21:36 ` [PATCH 6/7] iio: adc: Add support " marcelo.schmitt
2023-11-22 10:01 ` Krzysztof Kozlowski
@ 2023-11-23 6:30 ` Dan Carpenter
1 sibling, 0 replies; 13+ messages in thread
From: Dan Carpenter @ 2023-11-23 6:30 UTC (permalink / raw)
To: oe-kbuild, marcelo.schmitt@analog.com, beniamin.bia,
paul.cercueil, Michael.Hennerich, lars, jic23, marcelo.schmitt1
Cc: lkp, oe-kbuild-all, Marcelo Schmitt, linux-iio, linux-kernel
Hi,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/marcelo-schmitt-analog-com/MAINTAINERS-Add-MAINTAINERS-entry-for-AD7091R/20231122-093706
base: https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git togreg
patch link: https://lore.kernel.org/r/514295a9b760b44a710425803a41decddd3e8df8.1700595310.git.marcelo.schmitt1%40gmail.com
patch subject: [PATCH 6/7] iio: adc: Add support for AD7091R-8
config: x86_64-randconfig-161-20231122 (https://download.01.org/0day-ci/archive/20231123/202311230719.KwwC9NyC-lkp@intel.com/config)
compiler: clang version 16.0.4 (https://github.com/llvm/llvm-project.git ae42196bc493ffe877a7e3dff8be32035dea4d07)
reproduce: (https://download.01.org/0day-ci/archive/20231123/202311230719.KwwC9NyC-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Reported-by: Dan Carpenter <error27@gmail.com>
| Closes: https://lore.kernel.org/r/202311230719.KwwC9NyC-lkp@intel.com/
smatch warnings:
drivers/iio/adc/ad7091r-base.c:53 ad7091r_set_mode() warn: ignoring unreachable code.
vim +53 drivers/iio/adc/ad7091r-base.c
ca69300173b642 Paul Cercueil 2019-11-15 32 static int ad7091r_set_mode(struct ad7091r_state *st, enum ad7091r_mode mode)
ca69300173b642 Paul Cercueil 2019-11-15 33 {
ca69300173b642 Paul Cercueil 2019-11-15 34 int ret, conf;
ca69300173b642 Paul Cercueil 2019-11-15 35
ca69300173b642 Paul Cercueil 2019-11-15 36 switch (mode) {
ca69300173b642 Paul Cercueil 2019-11-15 37 case AD7091R_MODE_SAMPLE:
ca69300173b642 Paul Cercueil 2019-11-15 38 conf = 0;
ca69300173b642 Paul Cercueil 2019-11-15 39 break;
ca69300173b642 Paul Cercueil 2019-11-15 40 case AD7091R_MODE_COMMAND:
ca69300173b642 Paul Cercueil 2019-11-15 41 conf = AD7091R_REG_CONF_CMD;
ca69300173b642 Paul Cercueil 2019-11-15 42 break;
ca69300173b642 Paul Cercueil 2019-11-15 43 case AD7091R_MODE_AUTOCYCLE:
ca69300173b642 Paul Cercueil 2019-11-15 44 conf = AD7091R_REG_CONF_AUTO;
ca69300173b642 Paul Cercueil 2019-11-15 45 break;
ca69300173b642 Paul Cercueil 2019-11-15 46 default:
ca69300173b642 Paul Cercueil 2019-11-15 47 return -EINVAL;
ca69300173b642 Paul Cercueil 2019-11-15 48 }
ca69300173b642 Paul Cercueil 2019-11-15 49
fccb9cf346d38a Marcelo Schmitt 2023-11-21 50 /* AD7091R-2/4/8 don't set normal, command, autocycle modes in conf reg */
fccb9cf346d38a Marcelo Schmitt 2023-11-21 51 if (st->chip_info->type == AD7091R5) {
fccb9cf346d38a Marcelo Schmitt 2023-11-21 52 return 0;
I normally ignore when people add a return 0 to stub out code because
it's obviously deliberate. But this is a patch to add support for new
hardware and it's stubbing out the existing:
ret = regmap_update_bits()
For existing users... It feels like if that's necessary then it should
be done in a separate commit.
ca69300173b642 Paul Cercueil 2019-11-15 @53 ret = regmap_update_bits(st->map, AD7091R_REG_CONF,
ca69300173b642 Paul Cercueil 2019-11-15 54 AD7091R_REG_CONF_MODE_MASK, conf);
ca69300173b642 Paul Cercueil 2019-11-15 55 if (ret)
ca69300173b642 Paul Cercueil 2019-11-15 56 return ret;
fccb9cf346d38a Marcelo Schmitt 2023-11-21 57 }
ca69300173b642 Paul Cercueil 2019-11-15 58
ca69300173b642 Paul Cercueil 2019-11-15 59 st->mode = mode;
ca69300173b642 Paul Cercueil 2019-11-15 60
ca69300173b642 Paul Cercueil 2019-11-15 61 return 0;
ca69300173b642 Paul Cercueil 2019-11-15 62 }
--
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
^ permalink raw reply [flat|nested] 13+ messages in thread
* [PATCH 7/7] iio: adc: ad7091r-base: Add debugfs reg access
2023-11-21 21:33 [PATCH 0/7] Add support for AD7091R-2/-4/-8 marcelo.schmitt
` (5 preceding siblings ...)
2023-11-21 21:36 ` [PATCH 6/7] iio: adc: Add support " marcelo.schmitt
@ 2023-11-21 21:36 ` marcelo.schmitt
6 siblings, 0 replies; 13+ messages in thread
From: marcelo.schmitt @ 2023-11-21 21:36 UTC (permalink / raw)
To: beniamin.bia, paul.cercueil, Michael.Hennerich, lars, jic23,
marcelo.schmitt1
Cc: Marcelo Schmitt, linux-iio, linux-kernel
From: Marcelo Schmitt <marcelo.schmitt@analog.com>
Add direct register access support for AD7091R-2/-4/-5/-8 ADCs.
Signed-off-by: Marcelo Schmitt <marcelo.schmitt@analog.com>
---
drivers/iio/adc/ad7091r-base.c | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/drivers/iio/adc/ad7091r-base.c b/drivers/iio/adc/ad7091r-base.c
index f9b4f91d1c4f..798f7b3cc7e1 100644
--- a/drivers/iio/adc/ad7091r-base.c
+++ b/drivers/iio/adc/ad7091r-base.c
@@ -157,8 +157,20 @@ static int ad7091r_read_raw(struct iio_dev *iio_dev,
return ret;
}
+static int ad7091r_reg_access(struct iio_dev *indio_dev, unsigned int reg,
+ unsigned int writeval, unsigned int *readval)
+{
+ struct ad7091r_state *st = iio_priv(indio_dev);
+
+ if (readval)
+ return regmap_read(st->map, reg, readval);
+
+ return regmap_write(st->map, reg, writeval);
+}
+
static const struct iio_info ad7091r_info = {
.read_raw = ad7091r_read_raw,
+ .debugfs_reg_access = &ad7091r_reg_access,
};
static irqreturn_t ad7091r_event_handler(int irq, void *private)
--
2.42.0
^ permalink raw reply related [flat|nested] 13+ messages in thread