From 485055a93029a03dc72e2ef0da96d055d4789f04 Mon Sep 17 00:00:00 2001 From: David Wang Date: Tue, 11 Apr 2017 18:05:37 -0700 Subject: tegra: camera: updated control CID define Move control CID define to tegra-v4l2-camera and switched CID prefix from V4L2 to TEGRA_CAMERA. Updated users of camera controls to use new defines. Change-Id: Ifb1d4e9e3ed438bd13dd3af1d0ec16cb885f4474 Signed-off-by: David Wang Reviewed-on: http://git-master/r/1460998 GVS: Gerrit_Virtual_Submit Reviewed-by: Wenjia Zhou Reviewed-by: Bhanu Murthy V --- drivers/media/i2c/imx185.c | 43 ++++++++-------- drivers/media/i2c/imx214.c | 52 ++++++++++--------- drivers/media/i2c/imx219.c | 25 ++++----- drivers/media/i2c/imx274.c | 41 +++++++-------- drivers/media/i2c/lc898212.c | 3 +- drivers/media/i2c/ov10823.c | 35 +++++++------ drivers/media/i2c/ov23850.c | 49 +++++++++--------- drivers/media/i2c/ov5693.c | 60 ++++++++++++---------- drivers/media/i2c/ov9281.c | 35 +++++++------ drivers/media/i2c/tc358840.c | 1 + .../media/platform/tegra/camera/camera_common.c | 4 +- drivers/media/platform/tegra/camera/vi/channel.c | 21 ++++---- drivers/media/platform/tegra/camera/vi/vi2_fops.c | 6 +-- drivers/media/platform/tegra/camera/vi/vi4_fops.c | 6 +-- include/media/camera_common.h | 39 -------------- include/media/i2c/tc358840.h | 11 ++-- 16 files changed, 206 insertions(+), 225 deletions(-) diff --git a/drivers/media/i2c/imx185.c b/drivers/media/i2c/imx185.c index acefac3a6..07ff3ef18 100644 --- a/drivers/media/i2c/imx185.c +++ b/drivers/media/i2c/imx185.c @@ -27,6 +27,7 @@ #include #include +#include #include #include "imx185_mode_tbls.h" @@ -96,7 +97,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &imx185_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER64, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -107,7 +108,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx185_ctrl_ops, - .id = V4L2_CID_EXPOSURE, + .id = TEGRA_CAMERA_CID_EXPOSURE, .name = "Exposure", .type = V4L2_CTRL_TYPE_INTEGER64, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -118,7 +119,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx185_ctrl_ops, - .id = V4L2_CID_FRAME_RATE, + .id = TEGRA_CAMERA_CID_FRAME_RATE, .name = "Frame Rate", .type = V4L2_CTRL_TYPE_INTEGER64, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -129,7 +130,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx185_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -140,7 +141,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx185_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -151,7 +152,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx185_ctrl_ops, - .id = V4L2_CID_FUSE_ID, + .id = TEGRA_CAMERA_CID_FUSE_ID, .name = "Fuse ID", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -161,7 +162,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx185_ctrl_ops, - .id = V4L2_CID_SENSOR_MODE_ID, + .id = TEGRA_CAMERA_CID_SENSOR_MODE_ID, .name = "Sensor Mode", .type = V4L2_CTRL_TYPE_INTEGER64, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -385,16 +386,16 @@ static int imx185_s_stream(struct v4l2_subdev *sd, int enable) /* frame rate and exposure time */ memset(&ctrls, 0, sizeof(ctrls)); #if LINUX_VERSION_CODE > KERNEL_VERSION(4, 9, 0) - ctrls.which = V4L2_CTRL_ID2WHICH(V4L2_CID_GAIN); + ctrls.which = V4L2_CTRL_ID2WHICH(TEGRA_CAMERA_CID_GAIN); #else - ctrls.ctrl_class = V4L2_CTRL_ID2CLASS(V4L2_CID_GAIN); + ctrls.ctrl_class = V4L2_CTRL_ID2CLASS(TEGRA_CAMERA_CID_GAIN); #endif ctrls.count = 3; ctrls.controls = control; - control[0].id = V4L2_CID_GAIN; - control[1].id = V4L2_CID_FRAME_RATE; - control[2].id = V4L2_CID_EXPOSURE; + control[0].id = TEGRA_CAMERA_CID_GAIN; + control[1].id = TEGRA_CAMERA_CID_FRAME_RATE; + control[2].id = TEGRA_CAMERA_CID_EXPOSURE; err = v4l2_g_ext_ctrls(&priv->ctrl_handler, &ctrls); if (err == 0) { @@ -592,7 +593,7 @@ static int imx185_set_frame_rate(struct imx185 *priv, s64 val) } /* check hdr enable ctrl */ - control.id = V4L2_CID_HDR_EN; + control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &control); if (err < 0) { dev_err(&priv->i2c_client->dev, @@ -626,7 +627,7 @@ static int imx185_set_exposure(struct imx185 *priv, s64 val) "%s: val: %lld\n", __func__, val); /* check hdr enable ctrl */ - control.id = V4L2_CID_HDR_EN; + control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &control); if (err < 0) { dev_err(&priv->i2c_client->dev, @@ -777,7 +778,7 @@ static int imx185_fuse_id_setup(struct imx185 *priv) } } - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_FUSE_ID); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_FUSE_ID); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -828,21 +829,21 @@ static int imx185_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = imx185_set_gain(priv, *ctrl->p_new.p_s64); break; - case V4L2_CID_EXPOSURE: + case TEGRA_CAMERA_CID_EXPOSURE: err = imx185_set_exposure(priv, *ctrl->p_new.p_s64); break; - case V4L2_CID_FRAME_RATE: + case TEGRA_CAMERA_CID_FRAME_RATE: err = imx185_set_frame_rate(priv, *ctrl->p_new.p_s64); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: err = imx185_set_group_hold(priv, ctrl->val); break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; - case V4L2_CID_SENSOR_MODE_ID: + case TEGRA_CAMERA_CID_SENSOR_MODE_ID: s_data->sensor_mode_id = (int) (*ctrl->p_new.p_s64); break; default: diff --git a/drivers/media/i2c/imx214.c b/drivers/media/i2c/imx214.c index adb0d16d4..0090b7e77 100644 --- a/drivers/media/i2c/imx214.c +++ b/drivers/media/i2c/imx214.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -90,7 +91,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -101,7 +102,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_FRAME_LENGTH, + .id = TEGRA_CAMERA_CID_FRAME_LENGTH, .name = "Frame Length", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -112,7 +113,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_COARSE_TIME, + .id = TEGRA_CAMERA_CID_COARSE_TIME, .name = "Coarse Time", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -123,7 +124,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_COARSE_TIME_SHORT, + .id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT, .name = "Coarse Time Short", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -134,7 +135,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -145,7 +146,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -156,7 +157,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_EEPROM_DATA, + .id = TEGRA_CAMERA_CID_EEPROM_DATA, .name = "EEPROM Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_VOLATILE, @@ -166,7 +167,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_OTP_DATA, + .id = TEGRA_CAMERA_CID_OTP_DATA, .name = "OTP Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -176,7 +177,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx214_ctrl_ops, - .id = V4L2_CID_FUSE_ID, + .id = TEGRA_CAMERA_CID_FUSE_ID, .name = "Fuse ID", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -454,28 +455,28 @@ static int imx214_s_stream(struct v4l2_subdev *sd, int enable) * coarse integration time, and gain. Failures to write * overrides are non-fatal */ - control.id = V4L2_CID_GAIN; + control.id = TEGRA_CAMERA_CID_GAIN; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx214_set_gain(priv, control.value); if (err) dev_dbg(&client->dev, "%s: warning gain override failed\n", __func__); - control.id = V4L2_CID_FRAME_LENGTH; + control.id = TEGRA_CAMERA_CID_FRAME_LENGTH; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx214_set_frame_length(priv, control.value); if (err) dev_dbg(&client->dev, "%s: frame length override failed\n", __func__); - control.id = V4L2_CID_COARSE_TIME; + control.id = TEGRA_CAMERA_CID_COARSE_TIME; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx214_set_coarse_time(priv, control.value); if (err) dev_dbg(&client->dev, "%s: coarse time override failed\n", __func__); - control.id = V4L2_CID_COARSE_TIME_SHORT; + control.id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx214_set_coarse_time_short(priv, control.value); if (err) @@ -690,7 +691,7 @@ static int imx214_set_coarse_time_short(struct imx214 *priv, s32 val) int i = 0; /* check hdr enable ctrl */ - hdr_control.id = V4L2_CID_HDR_EN; + hdr_control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &hdr_control); if (err < 0) { @@ -751,7 +752,8 @@ static int imx214_eeprom_device_init(struct imx214 *priv) int err; struct v4l2_ctrl *ctrl; - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_EEPROM_DATA); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, + TEGRA_CAMERA_CID_EEPROM_DATA); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -885,7 +887,7 @@ static int imx214_otp_setup(struct imx214 *priv) IMX214_OTP_PAGE_SIZE); } - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_OTP_DATA); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_OTP_DATA); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -921,7 +923,7 @@ static int imx214_fuse_id_setup(struct imx214 *priv) IMX214_FUSE_ID_OTP_ROW_ADDR, IMX214_FUSE_ID_SIZE); - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_FUSE_ID); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_FUSE_ID); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -950,7 +952,7 @@ static int imx214_g_volatile_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_EEPROM_DATA: + case TEGRA_CAMERA_CID_EEPROM_DATA: err = imx214_read_eeprom(priv, ctrl); if (err) return err; @@ -973,19 +975,19 @@ static int imx214_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = imx214_set_gain(priv, ctrl->val); break; - case V4L2_CID_FRAME_LENGTH: + case TEGRA_CAMERA_CID_FRAME_LENGTH: err = imx214_set_frame_length(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME: + case TEGRA_CAMERA_CID_COARSE_TIME: err = imx214_set_coarse_time(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME_SHORT: + case TEGRA_CAMERA_CID_COARSE_TIME_SHORT: err = imx214_set_coarse_time_short(priv, ctrl->val); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: if (switch_ctrl_qmenu[ctrl->val] == SWITCH_ON) { priv->group_hold_en = true; } else { @@ -993,14 +995,14 @@ static int imx214_s_ctrl(struct v4l2_ctrl *ctrl) err = imx214_set_group_hold(priv); } break; - case V4L2_CID_EEPROM_DATA: + case TEGRA_CAMERA_CID_EEPROM_DATA: if (!ctrl->string[0]) break; err = imx214_write_eeprom(priv, ctrl->string); if (err) return err; break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; default: pr_err("%s: unknown ctrl id.\n", __func__); diff --git a/drivers/media/i2c/imx219.c b/drivers/media/i2c/imx219.c index ba36dc721..e648b478c 100644 --- a/drivers/media/i2c/imx219.c +++ b/drivers/media/i2c/imx219.c @@ -27,6 +27,7 @@ #include #include +#include #include #include #include @@ -86,7 +87,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &imx219_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -97,7 +98,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx219_ctrl_ops, - .id = V4L2_CID_FRAME_LENGTH, + .id = TEGRA_CAMERA_CID_FRAME_LENGTH, .name = "Frame Length", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -108,7 +109,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx219_ctrl_ops, - .id = V4L2_CID_COARSE_TIME, + .id = TEGRA_CAMERA_CID_COARSE_TIME, .name = "Coarse Time", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -119,7 +120,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx219_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -130,7 +131,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx219_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -141,7 +142,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx219_ctrl_ops, - .id = V4L2_CID_FUSE_ID, + .id = TEGRA_CAMERA_CID_FUSE_ID, .name = "Fuse ID", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -556,21 +557,21 @@ static int imx219_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = imx219_set_gain(priv, ctrl->val); break; - case V4L2_CID_FRAME_LENGTH: + case TEGRA_CAMERA_CID_FRAME_LENGTH: err = imx219_set_frame_length(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME: + case TEGRA_CAMERA_CID_COARSE_TIME: err = imx219_set_coarse_time(priv, ctrl->val); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: err = imx219_set_group_hold(priv, ctrl->val); break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; - case V4L2_CID_FUSE_ID: + case TEGRA_CAMERA_CID_FUSE_ID: break; default: pr_err("%s: unknown ctrl id.\n", __func__); diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index 0cc9a5865..716a48ab4 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -105,7 +106,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &imx274_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -116,7 +117,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx274_ctrl_ops, - .id = V4L2_CID_FRAME_LENGTH, + .id = TEGRA_CAMERA_CID_FRAME_LENGTH, .name = "Frame Length", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -127,7 +128,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx274_ctrl_ops, - .id = V4L2_CID_COARSE_TIME, + .id = TEGRA_CAMERA_CID_COARSE_TIME, .name = "Coarse Time", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -138,7 +139,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx274_ctrl_ops, - .id = V4L2_CID_COARSE_TIME_SHORT, + .id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT, .name = "Coarse Time Short", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -149,7 +150,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx274_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -160,7 +161,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &imx274_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -461,28 +462,28 @@ static int imx274_s_stream(struct v4l2_subdev *sd, int enable) if (s_data->override_enable) { /* write list of override regs for the asking frame length, */ /* coarse integration time, and gain. */ - control.id = V4L2_CID_GAIN; + control.id = TEGRA_CAMERA_CID_GAIN; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx274_set_gain(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error gain override\n", __func__); - control.id = V4L2_CID_FRAME_LENGTH; + control.id = TEGRA_CAMERA_CID_FRAME_LENGTH; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx274_set_frame_length(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error frame length override\n", __func__); - control.id = V4L2_CID_COARSE_TIME; + control.id = TEGRA_CAMERA_CID_COARSE_TIME; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx274_set_coarse_time(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error coarse time override\n", __func__); - control.id = V4L2_CID_HDR_EN; + control.id = TEGRA_CAMERA_CID_HDR_EN; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); if (err < 0) { dev_err(&priv->i2c_client->dev, @@ -492,7 +493,7 @@ static int imx274_s_stream(struct v4l2_subdev *sd, int enable) hdr_en = switch_ctrl_qmenu[control.value]; if (hdr_en == SWITCH_ON) { - control.id = V4L2_CID_COARSE_TIME_SHORT; + control.id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= imx274_set_coarse_time_shr_dol_short(priv, control.value); @@ -712,7 +713,7 @@ static int imx274_set_frame_length(struct imx274 *priv, s32 val) frame_rate, priv->vmax_dol); - control.id = V4L2_CID_HDR_EN; + control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &control); if (err < 0) { dev_err(&priv->i2c_client->dev, @@ -776,7 +777,7 @@ static int imx274_set_coarse_time(struct imx274 *priv, s32 val) int hdr_en; int err; - control.id = V4L2_CID_HDR_EN; + control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &control); if (err < 0) { dev_err(&priv->i2c_client->dev, @@ -845,7 +846,7 @@ static int imx274_set_coarse_time_shr_dol_short(struct imx274 *priv, s32 val) int i = 0; s64 et_short; - control.id = V4L2_CID_HDR_EN; + control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &control); if (err < 0) { dev_err(&priv->i2c_client->dev, @@ -1020,19 +1021,19 @@ static int imx274_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = imx274_set_gain(priv, ctrl->val); break; - case V4L2_CID_FRAME_LENGTH: + case TEGRA_CAMERA_CID_FRAME_LENGTH: err = imx274_set_frame_length(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME: + case TEGRA_CAMERA_CID_COARSE_TIME: err = imx274_set_coarse_time(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME_SHORT: + case TEGRA_CAMERA_CID_COARSE_TIME_SHORT: err = imx274_set_coarse_time_shr_dol_short(priv, ctrl->val); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: if (switch_ctrl_qmenu[ctrl->val] == SWITCH_ON) { priv->group_hold_en = true; } else { @@ -1040,7 +1041,7 @@ static int imx274_s_ctrl(struct v4l2_ctrl *ctrl) err = imx274_set_group_hold(priv); } break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; default: pr_err("%s: unknown ctrl id.\n", __func__); diff --git a/drivers/media/i2c/lc898212.c b/drivers/media/i2c/lc898212.c index 023724feb..c460ba245 100644 --- a/drivers/media/i2c/lc898212.c +++ b/drivers/media/i2c/lc898212.c @@ -28,6 +28,7 @@ #include #include +#include #include #include @@ -428,7 +429,7 @@ static int lc898212_s_stream(struct v4l2_subdev *sd, int enable) return err; /* write override registers for focus position */ - control.id = V4L2_CID_FOCUS_ABSOLUTE; + control.id = TEGRA_CAMERA_CID_FOCUS_ABSOLUTE; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= lc898212_set_position(priv, control.value); if (err) diff --git a/drivers/media/i2c/ov10823.c b/drivers/media/i2c/ov10823.c index 5e05c0e3b..0ed11deb4 100644 --- a/drivers/media/i2c/ov10823.c +++ b/drivers/media/i2c/ov10823.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -122,7 +123,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &ov10823_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -133,7 +134,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov10823_ctrl_ops, - .id = V4L2_CID_FRAME_LENGTH, + .id = TEGRA_CAMERA_CID_FRAME_LENGTH, .name = "Frame Length", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -144,7 +145,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov10823_ctrl_ops, - .id = V4L2_CID_COARSE_TIME, + .id = TEGRA_CAMERA_CID_COARSE_TIME, .name = "Coarse Time", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -155,7 +156,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov10823_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -166,7 +167,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov10823_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -177,7 +178,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov10823_ctrl_ops, - .id = V4L2_CID_OTP_DATA, + .id = TEGRA_CAMERA_CID_OTP_DATA, .name = "OTP Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -187,7 +188,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov10823_ctrl_ops, - .id = V4L2_CID_FUSE_ID, + .id = TEGRA_CAMERA_CID_FUSE_ID, .name = "Fuse ID", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -426,21 +427,21 @@ static int ov10823_s_stream(struct v4l2_subdev *sd, int enable) /* write list of override regs for the asking frame length, */ /* coarse integration time, and gain. Failures to write */ /* overrides are non-fatal. */ - control.id = V4L2_CID_GAIN; + control.id = TEGRA_CAMERA_CID_GAIN; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov10823_set_gain(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error gain override\n", __func__); - control.id = V4L2_CID_FRAME_LENGTH; + control.id = TEGRA_CAMERA_CID_FRAME_LENGTH; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov10823_set_frame_length(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error frame length override\n", __func__); - control.id = V4L2_CID_COARSE_TIME; + control.id = TEGRA_CAMERA_CID_COARSE_TIME; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov10823_set_coarse_time(priv, control.value); if (err) @@ -707,7 +708,7 @@ static int ov10823_otp_setup(struct ov10823 *priv) OV10823_OTP_SRAM_START_ADDR, OV10823_OTP_SIZE); - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_OTP_DATA); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_OTP_DATA); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -741,7 +742,7 @@ static int ov10823_fuse_id_setup(struct ov10823 *priv) OV10823_FUSE_ID_OTP_BASE_ADDR, OV10823_FUSE_ID_SIZE); - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_FUSE_ID); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_FUSE_ID); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -788,16 +789,16 @@ static int ov10823_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = ov10823_set_gain(priv, ctrl->val); break; - case V4L2_CID_FRAME_LENGTH: + case TEGRA_CAMERA_CID_FRAME_LENGTH: err = ov10823_set_frame_length(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME: + case TEGRA_CAMERA_CID_COARSE_TIME: err = ov10823_set_coarse_time(priv, ctrl->val); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: if (switch_ctrl_qmenu[ctrl->val] == SWITCH_ON) { priv->group_hold_en = true; } else { @@ -805,7 +806,7 @@ static int ov10823_s_ctrl(struct v4l2_ctrl *ctrl) err = ov10823_set_group_hold(priv); } break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; default: pr_err("%s: unknown ctrl id.\n", __func__); diff --git a/drivers/media/i2c/ov23850.c b/drivers/media/i2c/ov23850.c index aad540b16..1ce8d84fc 100644 --- a/drivers/media/i2c/ov23850.c +++ b/drivers/media/i2c/ov23850.c @@ -27,6 +27,7 @@ #include #include +#include #include #include @@ -124,7 +125,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -135,7 +136,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_FRAME_LENGTH, + .id = TEGRA_CAMERA_CID_FRAME_LENGTH, .name = "Frame Length", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -146,7 +147,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_COARSE_TIME, + .id = TEGRA_CAMERA_CID_COARSE_TIME, .name = "Coarse Time", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -157,7 +158,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_COARSE_TIME_SHORT, + .id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT, .name = "Coarse Time Short", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -168,7 +169,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -179,7 +180,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -190,7 +191,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_EEPROM_DATA, + .id = TEGRA_CAMERA_CID_EEPROM_DATA, .name = "EEPROM Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_VOLATILE, @@ -200,7 +201,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_OTP_DATA, + .id = TEGRA_CAMERA_CID_OTP_DATA, .name = "OTP Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -210,7 +211,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov23850_ctrl_ops, - .id = V4L2_CID_FUSE_ID, + .id = TEGRA_CAMERA_CID_FUSE_ID, .name = "Fuse ID", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -511,28 +512,28 @@ static int ov23850_s_stream(struct v4l2_subdev *sd, int enable) if (s_data->override_enable) { /* write list of override regs for the asking frame length, */ /* coarse integration time, and gain. */ - control.id = V4L2_CID_GAIN; + control.id = TEGRA_CAMERA_CID_GAIN; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov23850_set_gain(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error gain override\n", __func__); - control.id = V4L2_CID_FRAME_LENGTH; + control.id = TEGRA_CAMERA_CID_FRAME_LENGTH; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov23850_set_frame_length(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error frame length override\n", __func__); - control.id = V4L2_CID_COARSE_TIME; + control.id = TEGRA_CAMERA_CID_COARSE_TIME; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov23850_set_coarse_time(priv, control.value); if (err) dev_dbg(&client->dev, "%s: error coarse time override\n", __func__); - control.id = V4L2_CID_COARSE_TIME_SHORT; + control.id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov23850_set_coarse_time_short(priv, control.value); if (err) @@ -765,7 +766,7 @@ static int ov23850_set_coarse_time_short(struct ov23850 *priv, s32 val) int i = 0; /* check hdr enable ctrl */ - hdr_control.id = V4L2_CID_HDR_EN; + hdr_control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &hdr_control); if (err < 0) { @@ -1006,7 +1007,7 @@ static int ov23850_otp_setup(struct ov23850 *priv) if (err) return -ENODEV; - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_OTP_DATA); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_OTP_DATA); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -1043,7 +1044,7 @@ static int ov23850_fuse_id_setup(struct ov23850 *priv) if (err) return -ENODEV; - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_FUSE_ID); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_FUSE_ID); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -1072,7 +1073,7 @@ static int ov23850_g_volatile_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_EEPROM_DATA: + case TEGRA_CAMERA_CID_EEPROM_DATA: #if 0 err = ov23850_read_eeprom(priv, ctrl); if (err) @@ -1097,19 +1098,19 @@ static int ov23850_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = ov23850_set_gain(priv, ctrl->val); break; - case V4L2_CID_FRAME_LENGTH: + case TEGRA_CAMERA_CID_FRAME_LENGTH: err = ov23850_set_frame_length(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME: + case TEGRA_CAMERA_CID_COARSE_TIME: err = ov23850_set_coarse_time(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME_SHORT: + case TEGRA_CAMERA_CID_COARSE_TIME_SHORT: err = ov23850_set_coarse_time_short(priv, ctrl->val); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: if (switch_ctrl_qmenu[ctrl->val] == SWITCH_ON) { priv->group_hold_en = true; } else { @@ -1117,7 +1118,7 @@ static int ov23850_s_ctrl(struct v4l2_ctrl *ctrl) err = ov23850_set_group_hold(priv); } break; - case V4L2_CID_EEPROM_DATA: + case TEGRA_CAMERA_CID_EEPROM_DATA: #if 0 if (!ctrl->p_new.p_char[0]) break; @@ -1126,7 +1127,7 @@ static int ov23850_s_ctrl(struct v4l2_ctrl *ctrl) return err; #endif break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; default: pr_err("%s: unknown ctrl id.\n", __func__); diff --git a/drivers/media/i2c/ov5693.c b/drivers/media/i2c/ov5693.c index 508688b42..6aeadd31c 100644 --- a/drivers/media/i2c/ov5693.c +++ b/drivers/media/i2c/ov5693.c @@ -26,6 +26,7 @@ #include #include +#include #include #include @@ -99,7 +100,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -110,7 +111,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_FRAME_LENGTH, + .id = TEGRA_CAMERA_CID_FRAME_LENGTH, .name = "Frame Length", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -121,7 +122,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_COARSE_TIME, + .id = TEGRA_CAMERA_CID_COARSE_TIME, .name = "Coarse Time", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -132,7 +133,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_COARSE_TIME_SHORT, + .id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT, .name = "Coarse Time Short", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -143,7 +144,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -154,7 +155,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -165,7 +166,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_EEPROM_DATA, + .id = TEGRA_CAMERA_CID_EEPROM_DATA, .name = "EEPROM Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_VOLATILE, @@ -175,7 +176,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_OTP_DATA, + .id = TEGRA_CAMERA_CID_OTP_DATA, .name = "OTP Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -185,7 +186,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov5693_ctrl_ops, - .id = V4L2_CID_FUSE_ID, + .id = TEGRA_CAMERA_CID_FUSE_ID, .name = "Fuse ID", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -528,14 +529,14 @@ static int ov5693_s_stream(struct v4l2_subdev *sd, int enable) * coarse integration time, and gain. Failures to write * overrides are non-fatal */ - control.id = V4L2_CID_GAIN; + control.id = TEGRA_CAMERA_CID_GAIN; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov5693_set_gain(priv, control.value); if (err) dev_dbg(&client->dev, "%s: warning gain override failed\n", __func__); - control.id = V4L2_CID_FRAME_LENGTH; + control.id = TEGRA_CAMERA_CID_FRAME_LENGTH; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov5693_set_frame_length(priv, control.value); if (err) @@ -543,7 +544,7 @@ static int ov5693_s_stream(struct v4l2_subdev *sd, int enable) "%s: warning frame length override failed\n", __func__); - control.id = V4L2_CID_COARSE_TIME; + control.id = TEGRA_CAMERA_CID_COARSE_TIME; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov5693_set_coarse_time(priv, control.value); if (err) @@ -551,7 +552,7 @@ static int ov5693_s_stream(struct v4l2_subdev *sd, int enable) "%s: warning coarse time override failed\n", __func__); - control.id = V4L2_CID_COARSE_TIME_SHORT; + control.id = TEGRA_CAMERA_CID_COARSE_TIME_SHORT; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov5693_set_coarse_time_short(priv, control.value); if (err) @@ -741,8 +742,8 @@ fail: static void ov5693_update_ctrl_range(struct ov5693 *priv, s32 frame_length) { struct v4l2_ctrl *ctrl = NULL; - int ctrl_ids[2] = {V4L2_CID_COARSE_TIME, - V4L2_CID_COARSE_TIME_SHORT}; + int ctrl_ids[2] = {TEGRA_CAMERA_CID_COARSE_TIME, + TEGRA_CAMERA_CID_COARSE_TIME_SHORT}; s32 max, min, def; int i, j; @@ -853,7 +854,7 @@ static int ov5693_set_coarse_time_short(struct ov5693 *priv, s32 val) ov5693_set_group_hold(priv); /* check hdr enable ctrl */ - hdr_control.id = V4L2_CID_HDR_EN; + hdr_control.id = TEGRA_CAMERA_CID_HDR_EN; err = camera_common_g_ctrl(priv->s_data, &hdr_control); if (err < 0) { @@ -1044,7 +1045,7 @@ static int ov5693_otp_setup(struct ov5693 *priv) } } - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_OTP_DATA); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_OTP_DATA); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -1085,7 +1086,7 @@ static int ov5693_fuse_id_setup(struct ov5693 *priv) goto ret; } - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_FUSE_ID); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_FUSE_ID); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -1114,7 +1115,7 @@ static int ov5693_g_volatile_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_EEPROM_DATA: + case TEGRA_CAMERA_CID_EEPROM_DATA: err = ov5693_read_eeprom(priv, ctrl); if (err) return err; @@ -1137,19 +1138,19 @@ static int ov5693_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = ov5693_set_gain(priv, ctrl->val); break; - case V4L2_CID_FRAME_LENGTH: + case TEGRA_CAMERA_CID_FRAME_LENGTH: err = ov5693_set_frame_length(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME: + case TEGRA_CAMERA_CID_COARSE_TIME: err = ov5693_set_coarse_time(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME_SHORT: + case TEGRA_CAMERA_CID_COARSE_TIME_SHORT: err = ov5693_set_coarse_time_short(priv, ctrl->val); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: if (switch_ctrl_qmenu[ctrl->val] == SWITCH_ON) { priv->group_hold_en = true; } else { @@ -1157,14 +1158,14 @@ static int ov5693_s_ctrl(struct v4l2_ctrl *ctrl) err = ov5693_set_group_hold(priv); } break; - case V4L2_CID_EEPROM_DATA: + case TEGRA_CAMERA_CID_EEPROM_DATA: if (!ctrl->p_new.p_char[0]) break; err = ov5693_write_eeprom(priv, ctrl->p_new.p_char); if (err) return err; break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; default: pr_err("%s: unknown ctrl id.\n", __func__); @@ -1189,8 +1190,11 @@ static int ov5693_ctrls_init(struct ov5693 *priv, bool eeprom_ctrl) v4l2_ctrl_handler_init(&priv->ctrl_handler, numctrls); for (i = 0; i < numctrls; i++) { - /* Skip control 'V4L2_CID_EEPROM_DATA' if eeprom inint err */ - if (ctrl_config_list[i].id == V4L2_CID_EEPROM_DATA) { + /* + * Skip control 'TEGRA_CAMERA_CID_EEPROM_DATA' + * if eeprom inint err + */ + if (ctrl_config_list[i].id == TEGRA_CAMERA_CID_EEPROM_DATA) { if (!eeprom_ctrl) { common_data->numctrls -= 1; continue; diff --git a/drivers/media/i2c/ov9281.c b/drivers/media/i2c/ov9281.c index efa9f20d5..0537517c7 100644 --- a/drivers/media/i2c/ov9281.c +++ b/drivers/media/i2c/ov9281.c @@ -26,6 +26,7 @@ #include #include +#include #include #include "ov9281_mode_tbls.h" @@ -545,7 +546,7 @@ static int ov9281_otp_setup(struct ov9281 *priv) if (err) return err; - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_OTP_DATA); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_OTP_DATA); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -579,7 +580,7 @@ static int ov9281_fuse_id_setup(struct ov9281 *priv) if (err) return err; - ctrl = v4l2_ctrl_find(&priv->ctrl_handler, V4L2_CID_FUSE_ID); + ctrl = v4l2_ctrl_find(&priv->ctrl_handler, TEGRA_CAMERA_CID_FUSE_ID); if (!ctrl) { dev_err(&priv->i2c_client->dev, "could not find device ctrl.\n"); @@ -630,21 +631,21 @@ static int ov9281_s_stream(struct v4l2_subdev *sd, int enable) /* write list of override regs for the asking frame length, */ /* coarse integration time, and gain. Failures to write */ /* overrides are non-fatal. */ - control.id = V4L2_CID_GAIN; + control.id = TEGRA_CAMERA_CID_GAIN; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov9281_set_gain(priv, control.value); if (err) dev_warn(&client->dev, "%s: error gain override\n", __func__); - control.id = V4L2_CID_FRAME_LENGTH; + control.id = TEGRA_CAMERA_CID_FRAME_LENGTH; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov9281_set_frame_length(priv, control.value); if (err) dev_warn(&client->dev, "%s: error frame length override\n", __func__); - control.id = V4L2_CID_COARSE_TIME; + control.id = TEGRA_CAMERA_CID_COARSE_TIME; err = v4l2_g_ctrl(&priv->ctrl_handler, &control); err |= ov9281_set_coarse_time(priv, control.value); if (err) @@ -771,16 +772,16 @@ static int ov9281_s_ctrl(struct v4l2_ctrl *ctrl) return 0; switch (ctrl->id) { - case V4L2_CID_GAIN: + case TEGRA_CAMERA_CID_GAIN: err = ov9281_set_gain(priv, ctrl->val); break; - case V4L2_CID_FRAME_LENGTH: + case TEGRA_CAMERA_CID_FRAME_LENGTH: err = ov9281_set_frame_length(priv, ctrl->val); break; - case V4L2_CID_COARSE_TIME: + case TEGRA_CAMERA_CID_COARSE_TIME: err = ov9281_set_coarse_time(priv, ctrl->val); break; - case V4L2_CID_GROUP_HOLD: + case TEGRA_CAMERA_CID_GROUP_HOLD: if (switch_ctrl_qmenu[ctrl->val] == SWITCH_ON) { priv->group_hold_en = true; } else { @@ -788,7 +789,7 @@ static int ov9281_s_ctrl(struct v4l2_ctrl *ctrl) err = ov9281_set_group_hold(priv); } break; - case V4L2_CID_HDR_EN: + case TEGRA_CAMERA_CID_HDR_EN: break; default: dev_err(&priv->i2c_client->dev, "%s: unknown ctrl id.\n", @@ -808,7 +809,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { /* Do not change the name field for the controls! */ { .ops = &ov9281_ctrl_ops, - .id = V4L2_CID_GAIN, + .id = TEGRA_CAMERA_CID_GAIN, .name = "Gain", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -819,7 +820,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov9281_ctrl_ops, - .id = V4L2_CID_FRAME_LENGTH, + .id = TEGRA_CAMERA_CID_FRAME_LENGTH, .name = "Frame Length", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -830,7 +831,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov9281_ctrl_ops, - .id = V4L2_CID_COARSE_TIME, + .id = TEGRA_CAMERA_CID_COARSE_TIME, .name = "Coarse Time", .type = V4L2_CTRL_TYPE_INTEGER, .flags = V4L2_CTRL_FLAG_SLIDER, @@ -841,7 +842,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov9281_ctrl_ops, - .id = V4L2_CID_GROUP_HOLD, + .id = TEGRA_CAMERA_CID_GROUP_HOLD, .name = "Group Hold", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -852,7 +853,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov9281_ctrl_ops, - .id = V4L2_CID_HDR_EN, + .id = TEGRA_CAMERA_CID_HDR_EN, .name = "HDR enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .min = 0, @@ -863,7 +864,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov9281_ctrl_ops, - .id = V4L2_CID_OTP_DATA, + .id = TEGRA_CAMERA_CID_OTP_DATA, .name = "OTP Data", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, @@ -873,7 +874,7 @@ static struct v4l2_ctrl_config ctrl_config_list[] = { }, { .ops = &ov9281_ctrl_ops, - .id = V4L2_CID_FUSE_ID, + .id = TEGRA_CAMERA_CID_FUSE_ID, .name = "Fuse ID", .type = V4L2_CTRL_TYPE_STRING, .flags = V4L2_CTRL_FLAG_READ_ONLY, diff --git a/drivers/media/i2c/tc358840.c b/drivers/media/i2c/tc358840.c index 62261b53a..6779cf70b 100644 --- a/drivers/media/i2c/tc358840.c +++ b/drivers/media/i2c/tc358840.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include diff --git a/drivers/media/platform/tegra/camera/camera_common.c b/drivers/media/platform/tegra/camera/camera_common.c index adbed3f8d..717df88a9 100644 --- a/drivers/media/platform/tegra/camera/camera_common.c +++ b/drivers/media/platform/tegra/camera/camera_common.c @@ -15,6 +15,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ +#include +#include #include #include #include @@ -433,7 +435,7 @@ int camera_common_try_fmt(struct v4l2_subdev *sd, struct v4l2_mbus_framefmt *mf) mf->width, mf->height); /* check hdr enable ctrl */ - hdr_control.id = V4L2_CID_HDR_EN; + hdr_control.id = TEGRA_CAMERA_CID_HDR_EN; err = v4l2_g_ctrl(s_data->ctrl_handler, &hdr_control); if (err < 0) { diff --git a/drivers/media/platform/tegra/camera/vi/channel.c b/drivers/media/platform/tegra/camera/vi/channel.c index f7c25ef02..202520a59 100644 --- a/drivers/media/platform/tegra/camera/vi/channel.c +++ b/drivers/media/platform/tegra/camera/vi/channel.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -847,7 +848,7 @@ int tegra_channel_s_ctrl(struct v4l2_ctrl *ctrl) struct tegra_channel, ctrl_handler); switch (ctrl->id) { - case V4L2_CID_VI_BYPASS_MODE: + case TEGRA_CAMERA_CID_VI_BYPASS_MODE: if (switch_ctrl_qmenu[ctrl->val] == SWITCH_ON) chan->bypass = true; else if (chan->vi->bypass) { @@ -859,7 +860,7 @@ int tegra_channel_s_ctrl(struct v4l2_ctrl *ctrl) } else chan->bypass = false; break; - case V4L2_CID_OVERRIDE_ENABLE: + case TEGRA_CAMERA_CID_OVERRIDE_ENABLE: { struct v4l2_subdev *sd = chan->subdev_on_csi; struct i2c_client *client = v4l2_get_subdevdata(sd); @@ -884,14 +885,14 @@ int tegra_channel_s_ctrl(struct v4l2_ctrl *ctrl) } } break; - case V4L2_CID_VI_HEIGHT_ALIGN: + case TEGRA_CAMERA_CID_VI_HEIGHT_ALIGN: chan->height_align = ctrl->val; tegra_channel_update_format(chan, chan->format.width, chan->format.height, chan->format.pixelformat, &chan->fmtinfo->bpp, 0); break; - case V4L2_CID_VI_SIZE_ALIGN: + case TEGRA_CAMERA_CID_VI_SIZE_ALIGN: chan->size_align = size_align_ctrl_qmenu[ctrl->val]; tegra_channel_update_format(chan, chan->format.width, chan->format.height, @@ -913,7 +914,7 @@ static const struct v4l2_ctrl_ops channel_ctrl_ops = { static const struct v4l2_ctrl_config common_custom_ctrls[] = { { .ops = &channel_ctrl_ops, - .id = V4L2_CID_VI_BYPASS_MODE, + .id = TEGRA_CAMERA_CID_VI_BYPASS_MODE, .name = "Bypass Mode", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .def = 0, @@ -924,7 +925,7 @@ static const struct v4l2_ctrl_config common_custom_ctrls[] = { }, { .ops = &channel_ctrl_ops, - .id = V4L2_CID_OVERRIDE_ENABLE, + .id = TEGRA_CAMERA_CID_OVERRIDE_ENABLE, .name = "Override Enable", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .def = 0, @@ -935,7 +936,7 @@ static const struct v4l2_ctrl_config common_custom_ctrls[] = { }, { .ops = &channel_ctrl_ops, - .id = V4L2_CID_VI_HEIGHT_ALIGN, + .id = TEGRA_CAMERA_CID_VI_HEIGHT_ALIGN, .name = "Height Align", .type = V4L2_CTRL_TYPE_INTEGER, .min = 1, @@ -945,7 +946,7 @@ static const struct v4l2_ctrl_config common_custom_ctrls[] = { }, { .ops = &channel_ctrl_ops, - .id = V4L2_CID_VI_SIZE_ALIGN, + .id = TEGRA_CAMERA_CID_VI_SIZE_ALIGN, .name = "Size Align", .type = V4L2_CTRL_TYPE_INTEGER_MENU, .def = 0, @@ -979,8 +980,8 @@ static int tegra_channel_setup_controls(struct tegra_channel *chan) /* Add new custom controls */ for (i = 0; i < ARRAY_SIZE(common_custom_ctrls); i++) { /* don't create override control for pg mode */ - if (common_custom_ctrls[i].id == V4L2_CID_OVERRIDE_ENABLE && - chan->pg_mode) + if (common_custom_ctrls[i].id == + TEGRA_CAMERA_CID_OVERRIDE_ENABLE && chan->pg_mode) continue; v4l2_ctrl_new_custom(&chan->ctrl_handler, &common_custom_ctrls[i], NULL); diff --git a/drivers/media/platform/tegra/camera/vi/vi2_fops.c b/drivers/media/platform/tegra/camera/vi/vi2_fops.c index e468f9e0e..f92e703d6 100644 --- a/drivers/media/platform/tegra/camera/vi/vi2_fops.c +++ b/drivers/media/platform/tegra/camera/vi/vi2_fops.c @@ -101,7 +101,7 @@ int tegra_vi2_s_ctrl(struct v4l2_ctrl *ctrl) int err = 0; switch (ctrl->id) { - case V4L2_CID_WRITE_ISPFORMAT: + case TEGRA_CAMERA_CID_WRITE_ISPFORMAT: chan->write_ispformat = ctrl->val; break; default: @@ -119,7 +119,7 @@ static const struct v4l2_ctrl_ops vi2_ctrl_ops = { static const struct v4l2_ctrl_config vi2_custom_ctrls[] = { { .ops = &vi2_ctrl_ops, - .id = V4L2_CID_WRITE_ISPFORMAT, + .id = TEGRA_CAMERA_CID_WRITE_ISPFORMAT, .name = "Write ISP format", .type = V4L2_CTRL_TYPE_BOOLEAN, .def = 0, @@ -688,7 +688,7 @@ int vi2_channel_start_streaming(struct vb2_queue *vq, u32 count) /* disable override for vi mode */ override_ctrl = v4l2_ctrl_find( - &chan->ctrl_handler, V4L2_CID_OVERRIDE_ENABLE); + &chan->ctrl_handler, TEGRA_CAMERA_CID_OVERRIDE_ENABLE); if (!chan->pg_mode) { if (override_ctrl) { ret = v4l2_ctrl_s_ctrl(override_ctrl, false); diff --git a/drivers/media/platform/tegra/camera/vi/vi4_fops.c b/drivers/media/platform/tegra/camera/vi/vi4_fops.c index 0441cd856..d8a928ccf 100644 --- a/drivers/media/platform/tegra/camera/vi/vi4_fops.c +++ b/drivers/media/platform/tegra/camera/vi/vi4_fops.c @@ -189,7 +189,7 @@ int tegra_vi4_s_ctrl(struct v4l2_ctrl *ctrl) int err = 0; switch (ctrl->id) { - case V4L2_CID_WRITE_ISPFORMAT: + case TEGRA_CAMERA_CID_WRITE_ISPFORMAT: chan->write_ispformat = ctrl->val; break; default: @@ -207,7 +207,7 @@ static const struct v4l2_ctrl_ops vi4_ctrl_ops = { static const struct v4l2_ctrl_config vi4_custom_ctrls[] = { { .ops = &vi4_ctrl_ops, - .id = V4L2_CID_WRITE_ISPFORMAT, + .id = TEGRA_CAMERA_CID_WRITE_ISPFORMAT, .name = "Write ISP format", .type = V4L2_CTRL_TYPE_INTEGER, .def = 1, @@ -944,7 +944,7 @@ int vi4_channel_start_streaming(struct vb2_queue *vq, u32 count) /* disable override for vi mode */ override_ctrl = v4l2_ctrl_find( - &chan->ctrl_handler, V4L2_CID_OVERRIDE_ENABLE); + &chan->ctrl_handler, TEGRA_CAMERA_CID_OVERRIDE_ENABLE); if (!chan->pg_mode) { if (override_ctrl) { ret = v4l2_ctrl_s_ctrl(override_ctrl, false); diff --git a/include/media/camera_common.h b/include/media/camera_common.h index 0232d2bd0..016cb09ae 100644 --- a/include/media/camera_common.h +++ b/include/media/camera_common.h @@ -40,45 +40,6 @@ #include #include -#define V4L2_CID_TEGRA_CAMERA_BASE (V4L2_CTRL_CLASS_CAMERA | 0x2000) - -#define V4L2_CID_FRAME_LENGTH (V4L2_CID_TEGRA_CAMERA_BASE+0) -#define V4L2_CID_COARSE_TIME (V4L2_CID_TEGRA_CAMERA_BASE+1) -#define V4L2_CID_COARSE_TIME_SHORT (V4L2_CID_TEGRA_CAMERA_BASE+2) -#define V4L2_CID_GROUP_HOLD (V4L2_CID_TEGRA_CAMERA_BASE+3) -#define V4L2_CID_HDR_EN (V4L2_CID_TEGRA_CAMERA_BASE+4) -#define V4L2_CID_EEPROM_DATA (V4L2_CID_TEGRA_CAMERA_BASE+5) -#define V4L2_CID_OTP_DATA (V4L2_CID_TEGRA_CAMERA_BASE+6) -#define V4L2_CID_FUSE_ID (V4L2_CID_TEGRA_CAMERA_BASE+7) -#define V4L2_CID_TEGRA_CAMERA_LAST (V4L2_CID_TEGRA_CAMERA_BASE+8) -#define V4L2_CID_SENSOR_MODE_ID (V4L2_CID_TEGRA_CAMERA_BASE+10) - -/* undefine default CID for GAIN/EXPOSURE and use NV's version */ -#undef V4L2_CID_GAIN -#undef V4L2_CID_EXPOSURE -#define V4L2_CID_GAIN (V4L2_CID_TEGRA_CAMERA_BASE+11) -#define V4L2_CID_EXPOSURE (V4L2_CID_TEGRA_CAMERA_BASE+12) -#define V4L2_CID_FRAME_RATE (V4L2_CID_TEGRA_CAMERA_BASE+13) - -#define V4L2_CID_VI_BYPASS_MODE (V4L2_CID_TEGRA_CAMERA_BASE+100) -#define V4L2_CID_OVERRIDE_ENABLE (V4L2_CID_TEGRA_CAMERA_BASE+101) -#define V4L2_CID_VI_HEIGHT_ALIGN (V4L2_CID_TEGRA_CAMERA_BASE+102) -#define V4L2_CID_VI_SIZE_ALIGN (V4L2_CID_TEGRA_CAMERA_BASE+103) -#define V4L2_CID_WRITE_ISPFORMAT (V4L2_CID_TEGRA_CAMERA_BASE+104) -#define V4L2_CID_VI_CAPTURE_SETUP (V4L2_CID_TEGRA_CAMERA_BASE+105) -#define V4L2_CID_VI_CAPTURE_INFO (V4L2_CID_TEGRA_CAMERA_BASE+106) -#define V4L2_CID_VI_CAPTURE_RESET (V4L2_CID_TEGRA_CAMERA_BASE+107) -#define V4L2_CID_VI_CAPTURE_RELEASE (V4L2_CID_TEGRA_CAMERA_BASE+108) -#define V4L2_CID_VI_CAPTURE_CONFIG (V4L2_CID_TEGRA_CAMERA_BASE+109) -#define V4L2_CID_VI_CAPTURE_REQUEST (V4L2_CID_TEGRA_CAMERA_BASE+110) -#define V4L2_CID_VI_CAPTURE_STATUS (V4L2_CID_TEGRA_CAMERA_BASE+111) - -#define MAX_BUFFER_SIZE 32 -#define MAX_CID_CONTROLS 16 -#define MAX_NUM_SENSOR_MODES 30 -#define OF_MAX_STR_LEN 256 -#define OF_SENSORMODE_PREFIX ("mode") - /* * Scaling factor for converting a Q10.22 fixed point value * back to its original floating point value diff --git a/include/media/i2c/tc358840.h b/include/media/i2c/tc358840.h index 98161225c..31ffe8f12 100644 --- a/include/media/i2c/tc358840.h +++ b/include/media/i2c/tc358840.h @@ -77,13 +77,16 @@ struct tc358840_platform_data { }; /* custom controls */ -#define V4L2_CID_USER_TC358840_BASE (V4L2_CID_BASE + 0x1000) +#define TEGRA_CAMERA_CID_USER_TC358840_BASE (TEGRA_CAMERA_CID_BASE + 0x1000) /* Audio sample rate in Hz */ -#define TC358840_CID_AUDIO_SAMPLING_RATE (V4L2_CID_USER_TC358840_BASE + 1) +#define TC358840_CID_AUDIO_SAMPLING_RATE \ + (TEGRA_CAMERA_CID_USER_TC358840_BASE + 1) /* Audio present status */ -#define TC358840_CID_AUDIO_PRESENT (V4L2_CID_USER_TC358840_BASE + 2) +#define TC358840_CID_AUDIO_PRESENT \ + (TEGRA_CAMERA_CID_USER_TC358840_BASE + 2) /* Splitter width */ -#define TC358840_CID_SPLITTER_WIDTH (V4L2_CID_USER_TC358840_BASE + 3) +#define TC358840_CID_SPLITTER_WIDTH \ + (TEGRA_CAMERA_CID_USER_TC358840_BASE + 3) #endif /* _TC358840_ */ -- cgit v1.2.2