media: i2c: ov9282: Add HFLIP and VFLIP support
Adds support for V4L2_CID_HFLIP and V4L2_CID_VFLIP to allow flipping the image. The driver previously enabled H & V flips in the register table, therefore the controls default to the same settings to avoid changing the behaviour. Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Reviewed-by: Jacopo Mondi <jacopo@jmondi.org> Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com> Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Родитель
ed80071b95
Коммит
af2775dcba
|
@ -45,6 +45,10 @@
|
|||
/* Group hold register */
|
||||
#define OV9282_REG_HOLD 0x3308
|
||||
|
||||
#define OV9282_REG_TIMING_FORMAT_1 0x3820
|
||||
#define OV9282_REG_TIMING_FORMAT_2 0x3821
|
||||
#define OV9282_FLIP_BIT BIT(2)
|
||||
|
||||
#define OV9282_REG_MIPI_CTRL00 0x4800
|
||||
#define OV9282_GATED_CLOCK BIT(5)
|
||||
|
||||
|
@ -438,6 +442,40 @@ error_release_group_hold:
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int ov9282_set_ctrl_hflip(struct ov9282 *ov9282, int value)
|
||||
{
|
||||
u32 current_val;
|
||||
int ret = ov9282_read_reg(ov9282, OV9282_REG_TIMING_FORMAT_2, 1,
|
||||
¤t_val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (value)
|
||||
current_val |= OV9282_FLIP_BIT;
|
||||
else
|
||||
current_val &= ~OV9282_FLIP_BIT;
|
||||
|
||||
return ov9282_write_reg(ov9282, OV9282_REG_TIMING_FORMAT_2, 1,
|
||||
current_val);
|
||||
}
|
||||
|
||||
static int ov9282_set_ctrl_vflip(struct ov9282 *ov9282, int value)
|
||||
{
|
||||
u32 current_val;
|
||||
int ret = ov9282_read_reg(ov9282, OV9282_REG_TIMING_FORMAT_1, 1,
|
||||
¤t_val);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
if (value)
|
||||
current_val |= OV9282_FLIP_BIT;
|
||||
else
|
||||
current_val &= ~OV9282_FLIP_BIT;
|
||||
|
||||
return ov9282_write_reg(ov9282, OV9282_REG_TIMING_FORMAT_1, 1,
|
||||
current_val);
|
||||
}
|
||||
|
||||
/**
|
||||
* ov9282_set_ctrl() - Set subdevice control
|
||||
* @ctrl: pointer to v4l2_ctrl structure
|
||||
|
@ -494,6 +532,12 @@ static int ov9282_set_ctrl(struct v4l2_ctrl *ctrl)
|
|||
lpfr = ov9282->vblank + ov9282->cur_mode->height;
|
||||
ret = ov9282_write_reg(ov9282, OV9282_REG_LPFR, 2, lpfr);
|
||||
break;
|
||||
case V4L2_CID_HFLIP:
|
||||
ret = ov9282_set_ctrl_hflip(ov9282, ctrl->val);
|
||||
break;
|
||||
case V4L2_CID_VFLIP:
|
||||
ret = ov9282_set_ctrl_vflip(ov9282, ctrl->val);
|
||||
break;
|
||||
default:
|
||||
dev_err(ov9282->dev, "Invalid control %d", ctrl->id);
|
||||
ret = -EINVAL;
|
||||
|
@ -963,7 +1007,7 @@ static int ov9282_init_controls(struct ov9282 *ov9282)
|
|||
u32 lpfr;
|
||||
int ret;
|
||||
|
||||
ret = v4l2_ctrl_handler_init(ctrl_hdlr, 8);
|
||||
ret = v4l2_ctrl_handler_init(ctrl_hdlr, 10);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
|
@ -997,6 +1041,12 @@ static int ov9282_init_controls(struct ov9282 *ov9282)
|
|||
mode->vblank_max,
|
||||
1, mode->vblank);
|
||||
|
||||
v4l2_ctrl_new_std(ctrl_hdlr, &ov9282_ctrl_ops, V4L2_CID_VFLIP,
|
||||
0, 1, 1, 1);
|
||||
|
||||
v4l2_ctrl_new_std(ctrl_hdlr, &ov9282_ctrl_ops, V4L2_CID_HFLIP,
|
||||
0, 1, 1, 1);
|
||||
|
||||
/* Read only controls */
|
||||
v4l2_ctrl_new_std(ctrl_hdlr, &ov9282_ctrl_ops, V4L2_CID_PIXEL_RATE,
|
||||
OV9282_PIXEL_RATE, OV9282_PIXEL_RATE, 1,
|
||||
|
|
Загрузка…
Ссылка в новой задаче