| Message ID | 20221029093000.45451-7-sravanhome@gmail.com (mailing list archive) |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | Add support for mp2733 battery charger | expand |
On Sat, 29 Oct 2022 11:29:58 +0200 Saravanan Sekar <sravanhome@gmail.com> wrote: > Add support for mp2733 which is updated version of mp2629 > with a higher range of input voltage. > > Signed-off-by: Saravanan Sekar <sravanhome@gmail.com> > Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Hmm. this is going to slow things down wrt to this series going in. We want the associated fix to go in during this cycle, and this is dependant on a change going via MFD. Ah well. Generally I prefer to avoid using chip IDs for this sort of check because they don't generalize as well as an actual flag for this 'feature' stored in a chip_info type structure. However, we can tidy that up if it becomes relevant as more parts are added to the driver. On basis this might end up going via MFD, Acked-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > --- > drivers/iio/adc/mp2629_adc.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/drivers/iio/adc/mp2629_adc.c b/drivers/iio/adc/mp2629_adc.c > index 88e947f300cf..18290e176e1e 100644 > --- a/drivers/iio/adc/mp2629_adc.c > +++ b/drivers/iio/adc/mp2629_adc.c > @@ -66,6 +66,7 @@ static int mp2629_read_raw(struct iio_dev *indio_dev, > int *val, int *val2, long mask) > { > struct mp2629_adc *info = iio_priv(indio_dev); > + struct mp2629_data *ddata = dev_get_drvdata(info->dev); > unsigned int rval; > int ret; > > @@ -75,8 +76,10 @@ static int mp2629_read_raw(struct iio_dev *indio_dev, > if (ret) > return ret; > > - if (chan->channel == MP2629_INPUT_VOLT) > + if (chan->channel == MP2629_INPUT_VOLT && > + ddata->chip_id == CHIP_ID_MP2629) > rval &= GENMASK(6, 0); > + > *val = rval; > return IIO_VAL_INT; >
diff --git a/drivers/iio/adc/mp2629_adc.c b/drivers/iio/adc/mp2629_adc.c index 88e947f300cf..18290e176e1e 100644 --- a/drivers/iio/adc/mp2629_adc.c +++ b/drivers/iio/adc/mp2629_adc.c @@ -66,6 +66,7 @@ static int mp2629_read_raw(struct iio_dev *indio_dev, int *val, int *val2, long mask) { struct mp2629_adc *info = iio_priv(indio_dev); + struct mp2629_data *ddata = dev_get_drvdata(info->dev); unsigned int rval; int ret; @@ -75,8 +76,10 @@ static int mp2629_read_raw(struct iio_dev *indio_dev, if (ret) return ret; - if (chan->channel == MP2629_INPUT_VOLT) + if (chan->channel == MP2629_INPUT_VOLT && + ddata->chip_id == CHIP_ID_MP2629) rval &= GENMASK(6, 0); + *val = rval; return IIO_VAL_INT;