diff options
author | Frank Chen <frankc@nvidia.com> | 2017-11-09 15:04:12 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-28 16:29:14 -0500 |
commit | 42fa398755bc1c025f74acf81152aa216be98a14 (patch) | |
tree | 798c312db5a24aeb27089a581430cf215771cbd2 /drivers/media/i2c/lc898212.c | |
parent | 488446eda101c999cb79d7769fc8d99bacac30d6 (diff) |
tegra: camera: Update LC898212 control ID names
Update the control ID name to match the recent
sensor driver control ID changes.
Bug 200350907
Change-Id: I3af2ab683e5d4f98f6597d57b82b77a903d7cd63
Signed-off-by: Frank Chen <frankc@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1595380
(cherry picked from commit 642ee6b14611fcd203004b14d6bf552374a88c45)
Reviewed-on: https://git-master.nvidia.com/r/1604906
GVS: Gerrit_Virtual_Submit
Reviewed-by: Gigon Bae <gbae@nvidia.com>
Reviewed-by: Gary Zhang <garyz@nvidia.com>
Reviewed-by: Jihoon Bang <jbang@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/media/i2c/lc898212.c')
-rw-r--r-- | drivers/media/i2c/lc898212.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/media/i2c/lc898212.c b/drivers/media/i2c/lc898212.c index df580ad2f..722fed822 100644 --- a/drivers/media/i2c/lc898212.c +++ b/drivers/media/i2c/lc898212.c | |||
@@ -61,8 +61,8 @@ | |||
61 | #define LC898212_ADOFFSET 0x3C | 61 | #define LC898212_ADOFFSET 0x3C |
62 | #define LC898212_EQENBL 0x87 | 62 | #define LC898212_EQENBL 0x87 |
63 | 63 | ||
64 | #define V4L2_CID_CAMERA_LC898212_BASE (V4L2_CID_CAMERA_CLASS_BASE + 0x1000) | 64 | #define TEGRA_CAMERA_CID_CAMERA_LC898212_BASE (TEGRA_CAMERA_CID_BASE + 0x1000) |
65 | #define V4L2_CID_FOCUS_SYNC_EXTERNAL V4L2_CID_CAMERA_LC898212_BASE | 65 | #define TEGRA_CAMERA_CID_FOCUS_SYNC_EXTERNAL TEGRA_CAMERA_CID_CAMERA_LC898212_BASE |
66 | 66 | ||
67 | static int lc898212_s_ctrl(struct v4l2_ctrl *ctrl); | 67 | static int lc898212_s_ctrl(struct v4l2_ctrl *ctrl); |
68 | 68 | ||
@@ -98,7 +98,7 @@ static const struct v4l2_ctrl_config ctrl_config_list[] = { | |||
98 | /* Do not change the name field for the controls! */ | 98 | /* Do not change the name field for the controls! */ |
99 | { | 99 | { |
100 | .ops = &lc898212_ctrl_ops, | 100 | .ops = &lc898212_ctrl_ops, |
101 | .id = V4L2_CID_FOCUS_SYNC_EXTERNAL, | 101 | .id = TEGRA_CAMERA_CID_FOCUS_SYNC_EXTERNAL, |
102 | .name = "Focus Sync External", | 102 | .name = "Focus Sync External", |
103 | .type = V4L2_CTRL_TYPE_BOOLEAN, | 103 | .type = V4L2_CTRL_TYPE_BOOLEAN, |
104 | .max = 1, | 104 | .max = 1, |
@@ -267,7 +267,7 @@ static int lc898212_s_ctrl(struct v4l2_ctrl *ctrl) | |||
267 | case V4L2_CID_FOCUS_ABSOLUTE: | 267 | case V4L2_CID_FOCUS_ABSOLUTE: |
268 | err = lc898212_set_position(priv, ctrl->val); | 268 | err = lc898212_set_position(priv, ctrl->val); |
269 | break; | 269 | break; |
270 | case V4L2_CID_FOCUS_SYNC_EXTERNAL: | 270 | case TEGRA_CAMERA_CID_FOCUS_SYNC_EXTERNAL: |
271 | priv->sync_external = ctrl->val; | 271 | priv->sync_external = ctrl->val; |
272 | break; | 272 | break; |
273 | default: | 273 | default: |