2018年9月18日(火) 12:19 Matt Ranostay <[email protected]>:
>
> On Mon, Sep 17, 2018 at 9:03 AM Akinobu Mita <[email protected]> wrote:
> >
> > Use regmap for i2c register access. This simplifies register accesses and
> > chooses suitable access commands based on the functionality that the
> > adapter supports.
> >
> > Cc: Matt Ranostay <[email protected]>
> > Cc: Sakari Ailus <[email protected]>
> > Cc: Hans Verkuil <[email protected]>
> > Cc: Mauro Carvalho Chehab <[email protected]>
> > Signed-off-by: Akinobu Mita <[email protected]>
> > ---
> > drivers/media/i2c/video-i2c.c | 54
> > ++++++++++++++++++++++---------------------
> > 1 file changed, 28 insertions(+), 26 deletions(-)
> >
> > diff --git a/drivers/media/i2c/video-i2c.c b/drivers/media/i2c/video-i2c.c
> > index b7a2af9..90d389b 100644
> > --- a/drivers/media/i2c/video-i2c.c
> > +++ b/drivers/media/i2c/video-i2c.c
> > @@ -17,6 +17,7 @@
> > #include <linux/module.h>
> > #include <linux/mutex.h>
> > #include <linux/of_device.h>
> > +#include <linux/regmap.h>
> > #include <linux/sched.h>
> > #include <linux/slab.h>
> > #include <linux/videodev2.h>
> > @@ -38,7 +39,7 @@ struct video_i2c_buffer {
> > };
> >
> > struct video_i2c_data {
> > - struct i2c_client *client;
> > + struct regmap *regmap;
> > const struct video_i2c_chip *chip;
> > struct mutex lock;
> > spinlock_t slock;
> > @@ -62,6 +63,12 @@ static const struct v4l2_frmsize_discrete amg88xx_size =
> > {
> > .height = 8,
> > };
> >
> > +static const struct regmap_config amg88xx_regmap_config = {
> > + .reg_bits = 8,
> > + .val_bits = 8,
> > + .max_register = 0xff
> > +};
> > +
> > struct video_i2c_chip {
> > /* video dimensions */
> > const struct v4l2_fmtdesc *format;
> > @@ -76,6 +83,8 @@ struct video_i2c_chip {
> > /* pixel size in bits */
> > unsigned int bpp;
> >
> > + const struct regmap_config *regmap_config;
> > +
> > /* xfer function */
> > int (*xfer)(struct video_i2c_data *data, char *buf);
> >
> > @@ -85,24 +94,8 @@ struct video_i2c_chip {
> >
> > static int amg88xx_xfer(struct video_i2c_data *data, char *buf)
> > {
> > - struct i2c_client *client = data->client;
> > - struct i2c_msg msg[2];
> > - u8 reg = 0x80;
> > - int ret;
> > -
> > - msg[0].addr = client->addr;
> > - msg[0].flags = 0;
> > - msg[0].len = 1;
> > - msg[0].buf = (char *)®
> > -
> > - msg[1].addr = client->addr;
> > - msg[1].flags = I2C_M_RD;
> > - msg[1].len = data->chip->buffer_size;
> > - msg[1].buf = (char *)buf;
> > -
> > - ret = i2c_transfer(client->adapter, msg, 2);
> > -
> > - return (ret == 2) ? 0 : -EIO;
> > + return regmap_bulk_read(data->regmap, 0x80, buf,
> > + data->chip->buffer_size);
>
> May as well make 0x80 into a AMG88XX_REG_* define as in the later
> patch in this series
Sounds good. I'll do in v2.
> > }
> >
> > #if IS_ENABLED(CONFIG_HWMON)
> > @@ -133,12 +126,15 @@ static int amg88xx_read(struct device *dev, enum
> > hwmon_sensor_types type,
> > u32 attr, int channel, long *val)
> > {
> > struct video_i2c_data *data = dev_get_drvdata(dev);
> > - struct i2c_client *client = data->client;
> > - int tmp = i2c_smbus_read_word_data(client, 0x0e);
> > + __le16 buf;
> > + int tmp;
> >
> > - if (tmp < 0)
> > + tmp = regmap_bulk_read(data->regmap, 0x0e, &buf, 2);
>
> Same with 0x0e
OK.
