On Mon, May 14, 2018 at 11:16:42AM +0200, jacopo mondi wrote:
> Hi Sakari,
>
> On Mon, May 07, 2018 at 12:26:41PM +0300, Sakari Ailus wrote:
> > Dear Mita-san,
> >
> > On Sun, May 06, 2018 at 11:19:23PM +0900, Akinobu Mita wrote:
> > > The ov772x driver currently only supports legacy platform data probe.
> > > This change enables device tree probing.
> > >
> > > Note that the platform data probe can select auto or manual edge control
> > > mode, but the device tree probling can only select auto edge control mode
> > > for now.
> > >
> > > Cc: Jacopo Mondi <jacopo+rene...@jmondi.org>
> > > Cc: Laurent Pinchart <laurent.pinch...@ideasonboard.com>
> > > Cc: Hans Verkuil <hans.verk...@cisco.com>
> > > Cc: Sakari Ailus <sakari.ai...@linux.intel.com>
> > > Cc: Mauro Carvalho Chehab <mche...@s-opensource.com>
> > > Reviewed-by: Jacopo Mondi <jac...@jmondi.org>
> > > Signed-off-by: Akinobu Mita <akinobu.m...@gmail.com>
> > > ---
> > > * v5
> > > - Remove unnecessary space
> > >
> > > drivers/media/i2c/ov772x.c | 64
> > > ++++++++++++++++++++++++++++++++--------------
> > > 1 file changed, 45 insertions(+), 19 deletions(-)
> > >
> > > diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c
> > > index f939e28..2b02411 100644
> > > --- a/drivers/media/i2c/ov772x.c
> > > +++ b/drivers/media/i2c/ov772x.c
> > > @@ -749,13 +749,13 @@ static int ov772x_s_ctrl(struct v4l2_ctrl *ctrl)
> > > case V4L2_CID_VFLIP:
> > > val = ctrl->val ? VFLIP_IMG : 0x00;
> > > priv->flag_vflip = ctrl->val;
> > > - if (priv->info->flags & OV772X_FLAG_VFLIP)
> > > + if (priv->info && (priv->info->flags & OV772X_FLAG_VFLIP))
> > > val ^= VFLIP_IMG;
> > > return ov772x_mask_set(client, COM3, VFLIP_IMG, val);
> > > case V4L2_CID_HFLIP:
> > > val = ctrl->val ? HFLIP_IMG : 0x00;
> > > priv->flag_hflip = ctrl->val;
> > > - if (priv->info->flags & OV772X_FLAG_HFLIP)
> > > + if (priv->info && (priv->info->flags & OV772X_FLAG_HFLIP))
> > > val ^= HFLIP_IMG;
> > > return ov772x_mask_set(client, COM3, HFLIP_IMG, val);
> > > case V4L2_CID_BAND_STOP_FILTER:
> > > @@ -914,19 +914,14 @@ static void ov772x_select_params(const struct
> > > v4l2_mbus_framefmt *mf,
> > > *win = ov772x_select_win(mf->width, mf->height);
> > > }
> > >
> > > -static int ov772x_set_params(struct ov772x_priv *priv,
> > > - const struct ov772x_color_format *cfmt,
> > > - const struct ov772x_win_size *win)
> > > +static int ov772x_edgectrl(struct ov772x_priv *priv)
> > > {
> > > struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev);
> > > - struct v4l2_fract tpf;
> > > int ret;
> > > - u8 val;
> > >
> > > - /* Reset hardware. */
> > > - ov772x_reset(client);
> > > + if (!priv->info)
> > > + return 0;
> > >
> > > - /* Edge Ctrl. */
> > > if (priv->info->edgectrl.strength & OV772X_MANUAL_EDGE_CTRL) {
> > > /*
> > > * Manual Edge Control Mode.
> > > @@ -937,19 +932,19 @@ static int ov772x_set_params(struct ov772x_priv
> > > *priv,
> > >
> > > ret = ov772x_mask_set(client, DSPAUTO, EDGE_ACTRL, 0x00);
> > > if (ret < 0)
> > > - goto ov772x_set_fmt_error;
> > > + return ret;
> > >
> > > ret = ov772x_mask_set(client,
> > > EDGE_TRSHLD, OV772X_EDGE_THRESHOLD_MASK,
> > > priv->info->edgectrl.threshold);
> > > if (ret < 0)
> > > - goto ov772x_set_fmt_error;
> > > + return ret;
> > >
> > > ret = ov772x_mask_set(client,
> > > EDGE_STRNGT, OV772X_EDGE_STRENGTH_MASK,
> > > priv->info->edgectrl.strength);
> > > if (ret < 0)
> > > - goto ov772x_set_fmt_error;
> > > + return ret;
> > >
> > > } else if (priv->info->edgectrl.upper > priv->info->edgectrl.lower) {
> > > /*
> > > @@ -961,15 +956,35 @@ static int ov772x_set_params(struct ov772x_priv
> > > *priv,
> > > EDGE_UPPER, OV772X_EDGE_UPPER_MASK,
> > > priv->info->edgectrl.upper);
> > > if (ret < 0)
> > > - goto ov772x_set_fmt_error;
> > > + return ret;
> > >
> > > ret = ov772x_mask_set(client,
> > > EDGE_LOWER, OV772X_EDGE_LOWER_MASK,
> > > priv->info->edgectrl.lower);
> > > if (ret < 0)
> > > - goto ov772x_set_fmt_error;
> > > + return ret;
> > > }
> > >
> > > + return 0;
> > > +}
> > > +
> > > +static int ov772x_set_params(struct ov772x_priv *priv,
> > > + const struct ov772x_color_format *cfmt,
> > > + const struct ov772x_win_size *win)
> > > +{
> > > + struct i2c_client *client = v4l2_get_subdevdata(&priv->subdev);
> > > + struct v4l2_fract tpf;
> > > + int ret;
> > > + u8 val;
> > > +
> > > + /* Reset hardware. */
> > > + ov772x_reset(client);
> > > +
> > > + /* Edge Ctrl. */
> > > + ret = ov772x_edgectrl(priv);
> > > + if (ret < 0)
> > > + return ret;
> > > +
> > > /* Format and window size. */
> > > ret = ov772x_write(client, HSTART, win->rect.left >> 2);
> > > if (ret < 0)
> > > @@ -1020,9 +1035,9 @@ static int ov772x_set_params(struct ov772x_priv
> > > *priv,
> > >
> > > /* Set COM3. */
> > > val = cfmt->com3;
> > > - if (priv->info->flags & OV772X_FLAG_VFLIP)
> > > + if (priv->info && (priv->info->flags & OV772X_FLAG_VFLIP))
> > > val |= VFLIP_IMG;
> > > - if (priv->info->flags & OV772X_FLAG_HFLIP)
> > > + if (priv->info && (priv->info->flags & OV772X_FLAG_HFLIP))
> > > val |= HFLIP_IMG;
> > > if (priv->flag_vflip)
> > > val ^= VFLIP_IMG;
> > > @@ -1271,8 +1286,9 @@ static int ov772x_probe(struct i2c_client *client,
> > > struct i2c_adapter *adapter = client->adapter;
> > > int ret;
> > >
> > > - if (!client->dev.platform_data) {
> > > - dev_err(&client->dev, "Missing ov772x platform data\n");
> > > + if (!client->dev.of_node && !client->dev.platform_data) {
> > > + dev_err(&client->dev,
> > > + "Missing ov772x platform data for non-DT device\n");
> > > return -EINVAL;
> > > }
> > >
> > > @@ -1370,9 +1386,19 @@ static const struct i2c_device_id ov772x_id[] = {
> > > };
> > > MODULE_DEVICE_TABLE(i2c, ov772x_id);
> > >
> > > +#if IS_ENABLED(CONFIG_OF)
> > > +static const struct of_device_id ov772x_of_match[] = {
> > > + { .compatible = "ovti,ov7725", },
> > > + { .compatible = "ovti,ov7720", },
> > > + { /* sentinel */ },
> > > +};
> > > +MODULE_DEVICE_TABLE(of, ov772x_of_match);
> > > +#endif
> >
> > No need for #ifdef's nor of_match_ptr below.
> >
> > If no other changes would be needed for the set (pending Jacopo's review),
> > I can also drop these bits if you're ok for that.
>
> I've now reviewed all the patches in the series, 11/14 apart where I
> would apreciate if you could have a look at (nothing complex, just me
> not knowing enough of controls to feel confident enough to give my ack
> there).
>
> From my side then, the series is now fine. Thank Mita-san for your
> work.
Thanks. The diff is here:
diff --git a/drivers/media/i2c/ov772x.c b/drivers/media/i2c/ov772x.c
index 2b02411e9a5e..b5ae88e69b94 100644
--- a/drivers/media/i2c/ov772x.c
+++ b/drivers/media/i2c/ov772x.c
@@ -1386,19 +1386,17 @@ static const struct i2c_device_id ov772x_id[] = {
};
MODULE_DEVICE_TABLE(i2c, ov772x_id);
-#if IS_ENABLED(CONFIG_OF)
static const struct of_device_id ov772x_of_match[] = {
{ .compatible = "ovti,ov7725", },
{ .compatible = "ovti,ov7720", },
{ /* sentinel */ },
};
MODULE_DEVICE_TABLE(of, ov772x_of_match);
-#endif
static struct i2c_driver ov772x_i2c_driver = {
.driver = {
.name = "ov772x",
- .of_match_table = of_match_ptr(ov772x_of_match),
+ .of_match_table = ov772x_of_match,
},
.probe = ov772x_probe,
.remove = ov772x_remove,
--
Sakari Ailus
sakari.ai...@linux.intel.com
