提交 ab02f452 编写于 作者: D Dave Stevenson 提交者: Zheng Zengkai

media: i2c: ov5647: Set V4L2_SUBDEV_FL_HAS_EVENTS flag

raspberrypi inclusion
category: feature
bugzilla: 50432

--------------------------------

The ov5647 subdev can generate control events, therefore set
the V4L2_SUBDEV_FL_HAS_EVENTS flag.
Signed-off-by: NDave Stevenson <dave.stevenson@raspberrypi.com>
Signed-off-by: NFang Yafen <yafen@iscas.ac.cn>
Signed-off-by: NZheng Zengkai <zhengzengkai@huawei.com>
上级 7e43f478
...@@ -90,6 +90,8 @@ struct ov5647_mode { ...@@ -90,6 +90,8 @@ struct ov5647_mode {
struct v4l2_rect crop; struct v4l2_rect crop;
u64 pixel_rate; u64 pixel_rate;
/* HTS as defined in the register set (0x380C/0x380D) */
int hts;
struct regval_list *reg_list; struct regval_list *reg_list;
unsigned int num_regs; unsigned int num_regs;
...@@ -106,6 +108,7 @@ struct ov5647 { ...@@ -106,6 +108,7 @@ struct ov5647 {
unsigned int flags; unsigned int flags;
struct v4l2_ctrl_handler ctrls; struct v4l2_ctrl_handler ctrls;
struct v4l2_ctrl *pixel_rate; struct v4l2_ctrl *pixel_rate;
struct v4l2_ctrl *hblank;
bool write_mode_regs; bool write_mode_regs;
}; };
...@@ -605,6 +608,7 @@ static struct ov5647_mode supported_modes_8bit[] = { ...@@ -605,6 +608,7 @@ static struct ov5647_mode supported_modes_8bit[] = {
.height = 960, .height = 960,
}, },
.pixel_rate = 77291670, .pixel_rate = 77291670,
.hts = 1896,
ov5647_640x480_8bit, ov5647_640x480_8bit,
ARRAY_SIZE(ov5647_640x480_8bit) ARRAY_SIZE(ov5647_640x480_8bit)
}, },
...@@ -629,6 +633,7 @@ static struct ov5647_mode supported_modes_10bit[] = { ...@@ -629,6 +633,7 @@ static struct ov5647_mode supported_modes_10bit[] = {
.height = 1944 .height = 1944
}, },
.pixel_rate = 87500000, .pixel_rate = 87500000,
.hts = 2844,
ov5647_2592x1944_10bit, ov5647_2592x1944_10bit,
ARRAY_SIZE(ov5647_2592x1944_10bit) ARRAY_SIZE(ov5647_2592x1944_10bit)
}, },
...@@ -651,6 +656,7 @@ static struct ov5647_mode supported_modes_10bit[] = { ...@@ -651,6 +656,7 @@ static struct ov5647_mode supported_modes_10bit[] = {
.height = 1080, .height = 1080,
}, },
.pixel_rate = 81666700, .pixel_rate = 81666700,
.hts = 2416,
ov5647_1080p30_10bit, ov5647_1080p30_10bit,
ARRAY_SIZE(ov5647_1080p30_10bit) ARRAY_SIZE(ov5647_1080p30_10bit)
}, },
...@@ -672,6 +678,7 @@ static struct ov5647_mode supported_modes_10bit[] = { ...@@ -672,6 +678,7 @@ static struct ov5647_mode supported_modes_10bit[] = {
.height = 1944, .height = 1944,
}, },
.pixel_rate = 81666700, .pixel_rate = 81666700,
.hts = 1896,
ov5647_2x2binned_10bit, ov5647_2x2binned_10bit,
ARRAY_SIZE(ov5647_2x2binned_10bit) ARRAY_SIZE(ov5647_2x2binned_10bit)
}, },
...@@ -694,6 +701,7 @@ static struct ov5647_mode supported_modes_10bit[] = { ...@@ -694,6 +701,7 @@ static struct ov5647_mode supported_modes_10bit[] = {
.height = 1920, .height = 1920,
}, },
.pixel_rate = 55000000, .pixel_rate = 55000000,
.hts = 1852,
ov5647_640x480_10bit, ov5647_640x480_10bit,
ARRAY_SIZE(ov5647_640x480_10bit) ARRAY_SIZE(ov5647_640x480_10bit)
}, },
...@@ -1168,6 +1176,8 @@ static int ov5647_set_fmt(struct v4l2_subdev *sd, ...@@ -1168,6 +1176,8 @@ static int ov5647_set_fmt(struct v4l2_subdev *sd,
* If we have changed modes, write the I2C register list on * If we have changed modes, write the I2C register list on
* a stream_on(). * a stream_on().
*/ */
int hblank;
if (state->mode != mode) if (state->mode != mode)
state->write_mode_regs = true; state->write_mode_regs = true;
state->mode = mode; state->mode = mode;
...@@ -1176,6 +1186,9 @@ static int ov5647_set_fmt(struct v4l2_subdev *sd, ...@@ -1176,6 +1186,9 @@ static int ov5647_set_fmt(struct v4l2_subdev *sd,
mode->pixel_rate, mode->pixel_rate,
mode->pixel_rate, 1, mode->pixel_rate, 1,
mode->pixel_rate); mode->pixel_rate);
hblank = mode->hts - mode->format.width;
__v4l2_ctrl_modify_range(state->hblank, hblank, hblank, 1,
hblank);
} }
mutex_unlock(&state->lock); mutex_unlock(&state->lock);
...@@ -1395,6 +1408,9 @@ static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl) ...@@ -1395,6 +1408,9 @@ static int ov5647_s_ctrl(struct v4l2_ctrl *ctrl)
case V4L2_CID_PIXEL_RATE: case V4L2_CID_PIXEL_RATE:
/* Read-only, but we adjust it based on mode. */ /* Read-only, but we adjust it based on mode. */
break; break;
case V4L2_CID_HBLANK:
/* Read-only, but we adjust it based on mode. */
break;
default: default:
dev_info(&client->dev, dev_info(&client->dev,
"ctrl(id:0x%x,val:0x%x) is not handled\n", "ctrl(id:0x%x,val:0x%x) is not handled\n",
...@@ -1419,6 +1435,7 @@ static int ov5647_probe(struct i2c_client *client) ...@@ -1419,6 +1435,7 @@ static int ov5647_probe(struct i2c_client *client)
struct device_node *np = client->dev.of_node; struct device_node *np = client->dev.of_node;
u32 xclk_freq; u32 xclk_freq;
struct v4l2_ctrl *ctrl; struct v4l2_ctrl *ctrl;
int hblank;
sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL); sensor = devm_kzalloc(dev, sizeof(*sensor), GFP_KERNEL);
if (!sensor) if (!sensor)
...@@ -1452,7 +1469,7 @@ static int ov5647_probe(struct i2c_client *client) ...@@ -1452,7 +1469,7 @@ static int ov5647_probe(struct i2c_client *client)
mutex_init(&sensor->lock); mutex_init(&sensor->lock);
/* Initialise controls. */ /* Initialise controls. */
v4l2_ctrl_handler_init(&sensor->ctrls, 6); v4l2_ctrl_handler_init(&sensor->ctrls, 7);
v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops, v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
V4L2_CID_AUTOGAIN, V4L2_CID_AUTOGAIN,
0, /* min */ 0, /* min */
...@@ -1495,6 +1512,13 @@ static int ov5647_probe(struct i2c_client *client) ...@@ -1495,6 +1512,13 @@ static int ov5647_probe(struct i2c_client *client)
sensor->mode->pixel_rate, 1, sensor->mode->pixel_rate, 1,
sensor->mode->pixel_rate); sensor->mode->pixel_rate);
/* By default, HBLANK is read only, but it does change per mode */
hblank = sensor->mode->hts - sensor->mode->format.width;
sensor->hblank = v4l2_ctrl_new_std(&sensor->ctrls, &ov5647_ctrl_ops,
V4L2_CID_HBLANK, hblank, hblank, 1,
hblank);
sensor->hblank->flags |= V4L2_CTRL_FLAG_READ_ONLY;
if (sensor->ctrls.error) { if (sensor->ctrls.error) {
ret = sensor->ctrls.error; ret = sensor->ctrls.error;
dev_err(&client->dev, "%s control init failed (%d)\n", dev_err(&client->dev, "%s control init failed (%d)\n",
...@@ -1509,7 +1533,8 @@ static int ov5647_probe(struct i2c_client *client) ...@@ -1509,7 +1533,8 @@ static int ov5647_probe(struct i2c_client *client)
sd = &sensor->sd; sd = &sensor->sd;
v4l2_i2c_subdev_init(sd, client, &ov5647_subdev_ops); v4l2_i2c_subdev_init(sd, client, &ov5647_subdev_ops);
sensor->sd.internal_ops = &ov5647_subdev_internal_ops; sensor->sd.internal_ops = &ov5647_subdev_internal_ops;
sensor->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE; sensor->sd.flags |= V4L2_SUBDEV_FL_HAS_DEVNODE |
V4L2_SUBDEV_FL_HAS_EVENTS;
sensor->pad.flags = MEDIA_PAD_FL_SOURCE; sensor->pad.flags = MEDIA_PAD_FL_SOURCE;
sd->entity.function = MEDIA_ENT_F_CAM_SENSOR; sd->entity.function = MEDIA_ENT_F_CAM_SENSOR;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册