camera: v4l2: Add msm_isp_cmd structure in msm_isp.h.
This structure replaces msm_vfe32_cmd, and is exported
to user space.
Signed-off-by: Shuzhen Wang <shuzhenw@codeaurora.org>
diff --git a/drivers/media/video/msm/msm_vfe32.c b/drivers/media/video/msm/msm_vfe32.c
index ff281f2..0279c37 100644
--- a/drivers/media/video/msm/msm_vfe32.c
+++ b/drivers/media/video/msm/msm_vfe32.c
@@ -1103,7 +1103,7 @@
vfe32_program_dmi_cfg(NO_MEM_SELECTED);
}
-static int vfe32_proc_general(struct msm_vfe32_cmd *cmd)
+static int vfe32_proc_general(struct msm_isp_cmd *cmd)
{
int i , rc = 0;
uint32_t old_val = 0 , new_val = 0;
@@ -3051,7 +3051,7 @@
static long msm_vfe_subdev_ioctl(struct v4l2_subdev *sd,
unsigned int subdev_cmd, void *arg)
{
- struct msm_vfe32_cmd vfecmd;
+ struct msm_isp_cmd vfecmd;
struct msm_camvfe_params *vfe_params =
(struct msm_camvfe_params *)arg;
struct msm_vfe_cfg_cmd *cmd = vfe_params->vfe_cfg;
diff --git a/drivers/media/video/msm/msm_vfe32.h b/drivers/media/video/msm/msm_vfe32.h
index 2015a03..012c4b0 100644
--- a/drivers/media/video/msm/msm_vfe32.h
+++ b/drivers/media/video/msm/msm_vfe32.h
@@ -698,13 +698,6 @@
uint32_t asfMaxEdge;
};
-/* New one for 7x30 */
-struct msm_vfe32_cmd {
- int32_t id;
- uint16_t length;
- void *value;
-};
-
#define V32_PREVIEW_AXI_FLAG 0x00000001
#define V32_SNAPSHOT_AXI_FLAG (0x00000001<<1)
diff --git a/include/media/msm_isp.h b/include/media/msm_isp.h
index d57c4fb..b60216f 100644
--- a/include/media/msm_isp.h
+++ b/include/media/msm_isp.h
@@ -166,4 +166,10 @@
#define VFE_CMD_PCA_ROLL_OFF_CFG 120
#define VFE_CMD_PCA_ROLL_OFF_UPDATE 121
+struct msm_isp_cmd {
+ int32_t id;
+ uint16_t length;
+ void *value;
+};
+
#endif /* __MSM_ISP_H__ */