On Thu, 23 Mar 2023 23:09:16 -0400
William Breathitt Gray <william.gray@xxxxxxxxxx> wrote:
> The regmap API supports IO port accessors so we can take advantage of
> regmap abstractions rather than handling access to the device registers
> directly in the driver.
>
> Suggested-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Signed-off-by: William Breathitt Gray <william.gray@xxxxxxxxxx>
I would have preferred slightly if you had avoided reording the probe
(previously gpio chip was registered before iio device and now it is after)
but it make no real difference so I'm not that bothered.
A few other minor comments. Biggest one being that the defines should be
prefixed.
Thanks,
Jonathan
> integrated analog PC/104 card.
> diff --git a/drivers/iio/addac/stx104.c b/drivers/iio/addac/stx104.c
> index e45b70aa5bb7..6d65c163e47f 100644
> --- a/drivers/iio/addac/stx104.c
> +++ b/drivers/iio/addac/stx104.c
> +#define AIO_BASE 0x0
> +#define SOFTWARE_STROBE AIO_BASE
> +#define ADC_DATA AIO_BASE
> +#define ADC_CHANNEL (AIO_BASE + 0x2)
> +#define DIO_REG (AIO_BASE + 0x3)
> +#define DAC_BASE (AIO_BASE + 0x4)
> +#define ADC_STATUS (AIO_BASE + 0x8)
> +#define ADC_CONTROL (AIO_BASE + 0x9)
> +#define ADC_CONFIGURATION (AIO_BASE + 0x11)
> +
> +#define AIO_DATA_STRIDE 2
> +#define DAC_OFFSET(_channel) (DAC_BASE + AIO_DATA_STRIDE * (_channel))
> +
> +/* ADC Channel */
> +#define FC GENMASK(3, 0)
> +#define LC GENMASK(7, 4)
> +#define SAME_CHANNEL(_channel) (u8_encode_bits(_channel, FC) | u8_encode_bits(_channel, LC))
> +
> +/* ADC Status */
> +#define SD BIT(5)
> +#define CNV BIT(7)
> +#define DIFFERENTIAL 1
> +
> +/* ADC Control */
> +#define ALSS GENMASK(1, 0)
> +#define SOFTWARE_TRIGGER 0
> +
> +/* ADC Configuration */
> +#define GAIN GENMASK(1, 0)
> +#define ADBU BIT(2)
> +#define BIPOLAR 0
> +#define GAIN_X1 0
> +#define GAIN_X2 1
> +#define GAIN_X4 2
> +#define GAIN_X8 3
Better to give these an STX104_ prefix to avoid potential name clash
problems in the future.
> static int stx104_read_raw(struct iio_dev *indio_dev,
> struct iio_chan_spec const *chan, int *val, int *val2, long mask)
> {
...
> /* trigger ADC sample capture by writing to the 8-bit
> * Software Strobe Register and wait for completion
> */
> - iowrite8(0, ®->ssr_ad);
> - while (ioread8(®->cir_asr) & BIT(7));
> -
> - *val = ioread16(®->ssr_ad);
> + err = regmap_write(priv->aio_ctl_map, SOFTWARE_STROBE, 0);
> + if (err)
> + return err;
> + do {
> + err = regmap_read(priv->aio_ctl_map, ADC_STATUS, &adc_status);
> + if (err)
> + return err;
> + } while (u8_get_bits(adc_status, CNV));
This looks like a polled regmap read.
It should probably have a timeout as well just in case the device is broken.
regmap_read_poll_timeout()?
That is a functional change however, so perhaps should be a follow up patch.
> +
> + err = regmap_read(priv->aio_data_map, ADC_DATA, &value);
> + if (err)
> + return err;
> + *val = value;
> return IIO_VAL_INT;
>
> static int stx104_probe(struct device *dev, unsigned int id)
> {
> struct iio_dev *indio_dev;
> struct stx104_iio *priv;
> - struct stx104_gpio *stx104gpio;
> + struct gpio_regmap_config gpio_config = {};
You could fill this whole thing later with
gpio_config = (struct gpio_regmap_config) {
.parent = dev,
... etc
};
It might prove neater down there and would avoid need to
zero the whole thing up here (though hopefully the compiler
will figure out that is mostly not needed anyway).
> + void __iomem *stx104_base;
> + struct regmap *aio_ctl_map;
> + struct regmap *aio_data_map;
> + struct regmap *dio_map;
> int err;
> + unsigned int adc_status;
>
> indio_dev = devm_iio_device_alloc(dev, sizeof(*priv));
> if (!indio_dev)
> return -ENOMEM;
>
> - stx104gpio = devm_kzalloc(dev, sizeof(*stx104gpio), GFP_KERNEL);
> - if (!stx104gpio)
> - return -ENOMEM;
> -
> if (!devm_request_region(dev, base[id], STX104_EXTENT,
> dev_name(dev))) {
> dev_err(dev, "Unable to lock port addresses (0x%X-0x%X)\n",
> @@ -332,16 +365,35 @@ static int stx104_probe(struct device *dev, unsigned int id)
> return -EBUSY;
> }
>
> - priv = iio_priv(indio_dev);
> - priv->reg = devm_ioport_map(dev, base[id], STX104_EXTENT);
> - if (!priv->reg)
> + stx104_base = devm_ioport_map(dev, base[id], STX104_EXTENT);
> + if (!stx104_base)
> return -ENOMEM;
>
> + aio_ctl_map = devm_regmap_init_mmio(dev, stx104_base + AIO_BASE, &aio_ctl_regmap_config);
> + if (IS_ERR(aio_ctl_map))
> + return dev_err_probe(dev, PTR_ERR(aio_ctl_map),
> + "Unable to initialize aio_ctl register map\n");
Blank line here would slightly help readability as it keeps each set of call and error check
visually separated.
> + aio_data_map = devm_regmap_init_mmio(dev, stx104_base + AIO_BASE, &aio_data_regmap_config);
> + if (IS_ERR(aio_data_map))
> + return dev_err_probe(dev, PTR_ERR(aio_data_map),
> + "Unable to initialize aio_data register map\n");
also here
> + dio_map = devm_regmap_init_mmio(dev, stx104_base + DIO_REG, &dio_regmap_config);
> + if (IS_ERR(dio_map))
> + return dev_err_probe(dev, PTR_ERR(dio_map),
> + "Unable to initialize dio register map\n");
> +
> + priv = iio_priv(indio_dev);
> + priv->aio_ctl_map = aio_ctl_map;
> + priv->aio_data_map = aio_data_map;
