ENGR00243315-4 MXC V4L2 Capture:Improve debug info for s_std

[karo-tx-linux.git] / drivers / media / platform / mxc / capture / mxc_v4l2_capture.c

diff --git a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
index 22b90d3eb4b348d55739e74e4f36829fd1e7807e..84b6e4e857ef6757fed7fde09592cd11acc113ec 100755 (executable)
--- a/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
+++ b/drivers/media/platform/mxc/capture/mxc_v4l2_capture.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2004-2013 Freescale Semiconductor, Inc. All Rights Reserved.
+ * Copyright 2004-2014 Freescale Semiconductor, Inc. All Rights Reserved.
  */
 
 /*
@@ -44,7 +44,6 @@
 #include "ipu_prp_sw.h"
 
 #define init_MUTEX(sem)         sema_init(sem, 1)
-#define MXC_SENSOR_NUM 2
 
 static struct platform_device_id imx_v4l2_devtype[] = {
        {
@@ -1355,19 +1354,11 @@ static int mxc_v4l2_s_param(cam_data *cam, struct v4l2_streamparm *parm)
        csi_param.csi = cam->csi;
        csi_param.mclk = 0;
 
-       /*This may not work on other platforms. Check when adding a new one.*/
-       /*The mclk clock was never set correclty in the ipu register*/
-       /*for now we are going to use this mclk as pixel clock*/
-       /*to set csi0_data_dest register.*/
-       /*This is a workaround which should be fixed*/
        pr_debug("   clock_curr=mclk=%d\n", ifparm.u.bt656.clock_curr);
-       if (ifparm.u.bt656.clock_curr == 0) {
+       if (ifparm.u.bt656.clock_curr == 0)
                csi_param.clk_mode = IPU_CSI_CLK_MODE_CCIR656_INTERLACED;
-               /*protocol bt656 use 27Mhz pixel clock */
-               csi_param.mclk = 27000000;
-       } else {
+       else
                csi_param.clk_mode = IPU_CSI_CLK_MODE_GATED_CLK;
-       }
 
        csi_param.pixclk_pol = ifparm.u.bt656.latch_clk_inv;
 
@@ -1437,7 +1428,8 @@ exit:
  */
 static int mxc_v4l2_s_std(cam_data *cam, v4l2_std_id e)
 {
-       printk(KERN_ERR "In mxc_v4l2_s_std %Lx\n", e);
+       pr_debug("In mxc_v4l2_s_std %Lx\n", e);
+
        if (e == V4L2_STD_PAL) {
                pr_debug("   Setting standard to PAL %Lx\n", V4L2_STD_PAL);
                cam->standard.id = V4L2_STD_PAL;
@@ -3055,7 +3047,7 @@ static void mxc_v4l2_master_detach(struct v4l2_int_device *slave)
                        /* Move all the sensors behind this
                         * sensor one step forward
                         */
-                       for (; i < cam->sensor_index - 1; i++)
+                       for (; i <= MXC_SENSOR_NUM - 2; i++)
                                cam->all_sensors[i] = cam->all_sensors[i+1];
                        break;
                }