media: ov2640: add V4L2_CID_TEST_PATTERN control (62105006) · Commits · 戴 / test

drivers/media/i2c/ov2640.c

+13 −1

Original line number	Diff line number	Diff line
		@@ -705,6 +705,11 @@ err:
		return ret;
		}

		static const char * const ov2640_test_pattern_menu[] = {
		"Disabled",
		"Eight Vertical Colour Bars",
		};

		/*
		* functions
		*/
		@@ -740,6 +745,9 @@ static int ov2640_s_ctrl(struct v4l2_ctrl *ctrl)
		case V4L2_CID_HFLIP:
		val = ctrl->val ? REG04_HFLIP_IMG : 0x00;
		return ov2640_mask_set(client, REG04, REG04_HFLIP_IMG, val);
		case V4L2_CID_TEST_PATTERN:
		val = ctrl->val ? COM7_COLOR_BAR_TEST : 0x00;
		return ov2640_mask_set(client, COM7, COM7_COLOR_BAR_TEST, val);
		}

		return -EINVAL;
		@@ -1184,12 +1192,16 @@ static int ov2640_probe(struct i2c_client *client,
		v4l2_i2c_subdev_init(&priv->subdev, client, &ov2640_subdev_ops);
		priv->subdev.flags \|= V4L2_SUBDEV_FL_HAS_DEVNODE;
		mutex_init(&priv->lock);
		v4l2_ctrl_handler_init(&priv->hdl, 2);
		v4l2_ctrl_handler_init(&priv->hdl, 3);
		priv->hdl.lock = &priv->lock;
		v4l2_ctrl_new_std(&priv->hdl, &ov2640_ctrl_ops,
		V4L2_CID_VFLIP, 0, 1, 1, 0);
		v4l2_ctrl_new_std(&priv->hdl, &ov2640_ctrl_ops,
		V4L2_CID_HFLIP, 0, 1, 1, 0);
		v4l2_ctrl_new_std_menu_items(&priv->hdl, &ov2640_ctrl_ops,
		V4L2_CID_TEST_PATTERN,
		ARRAY_SIZE(ov2640_test_pattern_menu) - 1, 0, 0,
		ov2640_test_pattern_menu);
		priv->subdev.ctrl_handler = &priv->hdl;
		if (priv->hdl.error) {
		ret = priv->hdl.error;