On 09/25/2018 12:14 PM, Sakari Ailus wrote: > Assign units for the controls exposed by the smiapp driver. > > Signed-off-by: Sakari Ailus <sakari.ailus@xxxxxxxxxxxxxxx> > --- > drivers/media/i2c/smiapp/smiapp-core.c | 16 +++++++++------- > 1 file changed, 9 insertions(+), 7 deletions(-) > > diff --git a/drivers/media/i2c/smiapp/smiapp-core.c b/drivers/media/i2c/smiapp/smiapp-core.c > index 99f3b295ae3c7..289313c232430 100644 > --- a/drivers/media/i2c/smiapp/smiapp-core.c > +++ b/drivers/media/i2c/smiapp/smiapp-core.c > @@ -562,17 +562,10 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor) > sensor->vblank = v4l2_ctrl_new_std( > &sensor->pixel_array->ctrl_handler, &smiapp_ctrl_ops, > V4L2_CID_VBLANK, 0, 1, 1, 0); > - > - if (sensor->vblank) > - sensor->vblank->flags |= V4L2_CTRL_FLAG_UPDATE; > - > sensor->hblank = v4l2_ctrl_new_std( > &sensor->pixel_array->ctrl_handler, &smiapp_ctrl_ops, > V4L2_CID_HBLANK, 0, 1, 1, 0); > > - if (sensor->hblank) > - sensor->hblank->flags |= V4L2_CTRL_FLAG_UPDATE; > - > sensor->pixel_rate_parray = v4l2_ctrl_new_std( > &sensor->pixel_array->ctrl_handler, &smiapp_ctrl_ops, > V4L2_CID_PIXEL_RATE, 1, INT_MAX, 1, 1); > @@ -589,6 +582,13 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor) > return sensor->pixel_array->ctrl_handler.error; > } > > + sensor->exposure->unit = V4L2_CTRL_UNIT_LINE; > + sensor->vblank->flags |= V4L2_CTRL_FLAG_UPDATE; > + sensor->vblank->unit = V4L2_CTRL_UNIT_LINE; You can fill in the unit for this control in v4l2_ctrl_fill(). That means that this function gets extra arguments, but that's OK. There are probably quite a few controls were you can be explicit about the unit. BTW, it might be easier to add a new v4l2_ctrl_fill_units() function, I'm not sure what is best. > + sensor->hblank->flags |= V4L2_CTRL_FLAG_UPDATE; > + sensor->hblank->unit = V4L2_CTRL_UNIT_PIXEL; > + sensor->pixel_rate_parray->unit = V4L2_CTRL_UNIT_PIXELS_PER_SEC; > + > sensor->pixel_array->sd.ctrl_handler = > &sensor->pixel_array->ctrl_handler; > > @@ -611,6 +611,8 @@ static int smiapp_init_controls(struct smiapp_sensor *sensor) > return sensor->src->ctrl_handler.error; > } > > + sensor->pixel_rate_csi->unit = V4L2_CTRL_UNIT_PIXELS_PER_SEC; > + > sensor->src->sd.ctrl_handler = &sensor->src->ctrl_handler; > > return 0; > Regards, Hans
