media: atomisp: get rid of set pipe version custom ctrl

It doesn't make sense to have a control for that. Besides that,
the Intel Aero implementation doesn't have, which means that
even the custom control is not used in practice, at least
outside Android.

So, get rid of it.

Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>

diff --git a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
index 7edee293b1329ef4190ae9bf51fc45bf5353216d..1173be0e72b0c7423ec6709b27de9784526eef97 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_compat_css20.c
@@ -611,15 +611,6 @@ static void __apply_additional_pipe_config(
                if (stream_env->pipe_configs[pipe_id].
                    default_capture_config.mode == IA_CSS_CAPTURE_MODE_RAW)
                        stream_env->pipe_configs[pipe_id].enable_dz = false;
-
-               if (IS_ISP2401) {
-                       /* the isp default to use ISP2.2 and the camera hal will
-                       * control whether use isp2.7 */
-                       if (asd->select_isp_version->val == ATOMISP_CSS_ISP_PIPE_VERSION_2_7)
-                               stream_env->pipe_configs[pipe_id].isp_pipe_version =  SH_CSS_ISP_PIPE_VERSION_2_7;
-                       else
-                               stream_env->pipe_configs[pipe_id].isp_pipe_version = SH_CSS_ISP_PIPE_VERSION_2_2;
-               }
                break;
        case IA_CSS_PIPE_ID_VIDEO:
                /* enable reduced pipe to have binary

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.c b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
index a3f3c42f9db7abbdccf061ededa0bb25ac053b53..1807cfa786a743df8e15fb6862a72d848c3c9486 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.c
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.c
@@ -1058,24 +1058,6 @@ static const struct v4l2_ctrl_config ctrl_depth_mode = {
        .def = 0,
 };
 
-/*
- * Control for selectting ISP version
- *
- * When enabled, that means ISP version will be used ISP2.7. when disable, the
- * isp will default to use ISP2.2.
- * Note: Make sure set this configuration before creating stream.
- */
-static const struct v4l2_ctrl_config ctrl_select_isp_version = {
-       .ops = &ctrl_ops,
-       .id = V4L2_CID_ATOMISP_SELECT_ISP_VERSION,
-       .type = V4L2_CTRL_TYPE_BOOLEAN,
-       .name = "Select Isp version",
-       .min = 0,
-       .max = 1,
-       .step = 1,
-       .def = 0,
-};
-
 static void atomisp_init_subdev_pipe(struct atomisp_sub_device *asd,
                                     struct atomisp_video_pipe *pipe, enum v4l2_buf_type buf_type)
 {
@@ -1223,11 +1205,6 @@ static int isp_subdev_init_entities(struct atomisp_sub_device *asd)
            v4l2_ctrl_new_custom(&asd->ctrl_handler,
                                 &ctrl_disable_dz,
                                 NULL);
-       if (IS_ISP2401) {
-               asd->select_isp_version = v4l2_ctrl_new_custom(&asd->ctrl_handler,
-                                                              &ctrl_select_isp_version,
-                                                              NULL);
-       }
 
        /* Make controls visible on subdev as well. */
        asd->subdev.ctrl_handler = &asd->ctrl_handler;

diff --git a/drivers/staging/media/atomisp/pci/atomisp_subdev.h b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
index a8d210ea5f8be8b9be8410be7029ca734fa1b487..7d731f1fee7207484f6e50aee4f75a9d475e469c 100644 (file)
--- a/drivers/staging/media/atomisp/pci/atomisp_subdev.h
+++ b/drivers/staging/media/atomisp/pci/atomisp_subdev.h
@@ -319,7 +319,6 @@ struct atomisp_sub_device {
 
        /* ISP2401 */
        struct v4l2_ctrl *ion_dev_fd;
-       struct v4l2_ctrl *select_isp_version;
 
        struct v4l2_ctrl *disable_dz;