msm: camera: Fix to choose proper CSI device for 8625 target
Update board file to choose proper CSI (Camera Serial Interface)
device for 8625 target to fix CSI IRQ failure
Change-Id: I6c273739ad3114b69cf48ee32fa41cefcc408e2c
Signed-off-by: Raju P.L.S.S.S.N <rplsssn@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-msm7627a-camera.c b/arch/arm/mach-msm/board-msm7627a-camera.c
index 5daf895..7fecf59 100644
--- a/arch/arm/mach-msm/board-msm7627a-camera.c
+++ b/arch/arm/mach-msm/board-msm7627a-camera.c
@@ -297,8 +297,13 @@
sensor_board_info_ov5647.cam_vreg = NULL;
sensor_board_info_ov5647.num_vreg = 0;
}
- platform_device_register(&msm7x27a_device_csic0);
- platform_device_register(&msm7x27a_device_csic1);
+ if (machine_is_msm8625_surf() || machine_is_msm8625_evb()) {
+ platform_device_register(&msm8625_device_csic0);
+ platform_device_register(&msm8625_device_csic1);
+ } else {
+ platform_device_register(&msm7x27a_device_csic0);
+ platform_device_register(&msm7x27a_device_csic1);
+ }
platform_device_register(&msm7x27a_device_clkctl);
platform_device_register(&msm7x27a_device_vfe);
}
diff --git a/drivers/media/video/msm/msm_vfe7x27a_v4l2.c b/drivers/media/video/msm/msm_vfe7x27a_v4l2.c
index 07a4c89..e1f4532 100644
--- a/drivers/media/video/msm/msm_vfe7x27a_v4l2.c
+++ b/drivers/media/video/msm/msm_vfe7x27a_v4l2.c
@@ -1138,7 +1138,6 @@
case CMD_AXI_CFG_SEC: {
CDBG("CMD_AXI_CFG_SEC\n");
raw_mode = 0;
- vfe2x_ctrl->output_mode = OUTPUT_SEC;
axio = kmalloc(sizeof(struct axiout), GFP_ATOMIC);
if (!axio) {
pr_err("NULL axio\n");
@@ -1191,7 +1190,6 @@
case CMD_AXI_CFG_PRIM: {
CDBG("CMD_AXI_CFG_PRIM : %d\n", op_mode);
raw_mode = 0;
- vfe2x_ctrl->output_mode = OUTPUT_PRIM;
axio = kmalloc(sizeof(struct axiout), GFP_ATOMIC);
if (!axio) {
pr_err("NULL axio\n");
@@ -1257,7 +1255,6 @@
case CMD_AXI_CFG_SEC|CMD_AXI_CFG_PRIM: {
CDBG("CMD_AXI_CFG_SEC|PRIM\n");
raw_mode = 0;
- vfe2x_ctrl->output_mode = OUTPUT_SEC|OUTPUT_PRIM;
axio = kmalloc(sizeof(struct axiout), GFP_ATOMIC);
if (!axio) {
pr_err("NULL axio\n");
@@ -1333,7 +1330,6 @@
break;
case CMD_RAW_PICT_AXI_CFG: {
CDBG("CMD_RAW_PICT_AXI_CFG:%d\n", op_mode);
- vfe2x_ctrl->output_mode = OUTPUT_PRIM;
raw_mode = 1;
axio = kmalloc(sizeof(struct axiout), GFP_ATOMIC);
if (!axio) {
diff --git a/drivers/media/video/msm/msm_vfe7x27a_v4l2.h b/drivers/media/video/msm/msm_vfe7x27a_v4l2.h
index 33d6c17..90237bd 100644
--- a/drivers/media/video/msm/msm_vfe7x27a_v4l2.h
+++ b/drivers/media/video/msm/msm_vfe7x27a_v4l2.h
@@ -79,7 +79,6 @@
} __packed;
struct vfe2x_ctrl_type {
- uint16_t output_mode;
struct buf_info prev;
struct buf_info video;
struct buf_info snap;