On Sat, 16 Dec 2023 14:47:25 -0300
Marcelo Schmitt <marcelo.schmitt@xxxxxxxxxx> wrote:
> Some code generic to AD7091R devices such as channel definitions and
> event spec structs were in the AD7091R-5 driver.
> There was also some generic register definitions declared in the base
> driver which would make more sense to be in the header file.
> The device state struct will be needed for the ad7091r8 driver in a
> follow up patch so that ought to be moved to the header file as well.
> Lastly, a couple of regmap callback functions are also capable of
> abstracting characteristics of different AD7091R devices and those are
> now being exported to IIO_AD7091R name space.
>
> Move AD7091R generic code either to the base driver or to the header
> file so both the ad7091r5 and the ad7091r8 driver can use those
> declaration in follow up patches.
>
> Signed-off-by: Marcelo Schmitt <marcelo.schmitt@xxxxxxxxxx>
Hi Marcelo
I'm going to stop here as can't apply next patch because of build warnings
and this one is hard to justify without the rest of the series.
So please just include this patch onwards in v5.
This looks fine to me btw. I'll just comment on patches where I have
anything to add. If not they look fine.
Jonathan
> ---
> drivers/iio/adc/ad7091r-base.c | 46 +++++++++++++++++-----------------
> drivers/iio/adc/ad7091r-base.h | 42 ++++++++++++++++++++++++++++++-
> drivers/iio/adc/ad7091r5.c | 39 +++-------------------------
> 3 files changed, 68 insertions(+), 59 deletions(-)
>
> diff --git a/drivers/iio/adc/ad7091r-base.c b/drivers/iio/adc/ad7091r-base.c
> index d3d287d3b953..0d1f544de07a 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)
> @@ -35,20 +27,26 @@
> #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 */
> +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),
> + },
> };
> +EXPORT_SYMBOL_NS_GPL(ad7091r_events, IIO_AD7091R);
>
> static int ad7091r_set_mode(struct ad7091r_state *st, enum ad7091r_mode mode)
> {
> @@ -269,7 +267,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:
> @@ -279,8 +277,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:
> @@ -290,6 +289,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..1d30eeb46bcc 100644
> --- a/drivers/iio/adc/ad7091r-base.h
> +++ b/drivers/iio/adc/ad7091r-base.h
> @@ -8,8 +8,43 @@
> #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;
> +
> +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;
> @@ -17,10 +52,15 @@ struct ad7091r_chip_info {
> unsigned int vref_mV;
> };
>
> +extern const struct iio_event_spec ad7091r_events[3];
> +
> 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[] = {
