ov8830: use all four CSI lanes

BZ: 16972

Change-Id: I2b014c7686e31402a44ba7b50202e44b0e069176
Signed-off-by: Tuukka Toivonen <tuukka.toivonen@intel.com>
Reviewed-on: http://android.intel.com:8080/32616
Reviewed-by: Koski, Anttu <anttu.koski@intel.com>
Tested-by: Koski, Anttu <anttu.koski@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/arch/x86/platform/mrst/mrst.c b/arch/x86/platform/mrst/mrst.c
index bcd8f1e..fc9ffc7 100644 (file)
--- a/arch/x86/platform/mrst/mrst.c
+++ b/arch/x86/platform/mrst/mrst.c
@@ -1344,7 +1344,7 @@ static int ov8830_power_ctrl(struct v4l2_subdev *sd, int flag)
 
 static int ov8830_csi_configure(struct v4l2_subdev *sd, int flag)
 {
-       static const int LANES = 2;
+       static const int LANES = 4;
        return camera_sensor_csi(sd, ATOMISP_CAMERA_PORT_PRIMARY, LANES,
                ATOMISP_INPUT_FORMAT_RAW_10, atomisp_bayer_order_bggr, flag);
 }

diff --git a/drivers/media/video/ov8830.c b/drivers/media/video/ov8830.c
index ff20d00..12ce344 100644 (file)
--- a/drivers/media/video/ov8830.c
+++ b/drivers/media/video/ov8830.c
@@ -60,8 +60,8 @@ static const struct ov8830_reg ov8830_mode1[] = {
        { OV8830_8BIT, { 0x3001 }, 0x2a },
        { OV8830_8BIT, { 0x3002 }, 0x88 },
        { OV8830_8BIT, { 0x3005 }, 0x00 },
-       { OV8830_8BIT, { 0x3011 }, 0x21 },
-       { OV8830_8BIT, { 0x3015 }, 0xc8 },
+       { OV8830_8BIT, { 0x3011 }, 0x41 },
+       { OV8830_8BIT, { 0x3015 }, 0x08 },
        { OV8830_8BIT, { 0x301b }, 0xb4 },
        { OV8830_8BIT, { 0x301d }, 0x02 },
        { OV8830_8BIT, { 0x3021 }, 0x00 },