mt9e013: add a full FOV mode for 1080p

BZ: 41720

Add sensor mode with full field-of-view (FOV) and resolution
1640x956 @ 30 fps for Blackbay. This mode can be used for creating
1080p mode by using ISP upscaling.

Also add an option to specifically enable sensor modes which have
less than full FOV. Enable low FOV modes for Blackbay but leave
disabled for Enzo and Lexington.

Change-Id: Ib8d0743bcad62b1d275266add4c3a1a398941ef5
Signed-off-by: Tuukka Toivonen <tuukka.toivonen@intel.com>
Reviewed-on: http://android.intel.com:8080/52874
Reviewed-by: Laakso, Antti <antti.laakso@intel.com>
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/drivers/media/video/mt9e013/Kconfig b/drivers/media/video/mt9e013/Kconfig
index 406f38f..caf355a 100644 (file)
--- a/drivers/media/video/mt9e013/Kconfig
+++ b/drivers/media/video/mt9e013/Kconfig
@@ -14,6 +14,7 @@ choice
 
 config VIDEO_MT9E013_BLACKBAY
        bool "MT9E013 settings for Blackbay"
+       select VIDEO_MT9E013_LOW_FOV
        ---help---
          Default mt9e013 sensor settings for Blackbay
 config VIDEO_MT9E013_LEXINGTON
@@ -25,3 +26,10 @@ config VIDEO_MT9E013_ENZO
        ---help---
          Default mt9e013 sensor settings for Enzo
 endchoice
+
+config VIDEO_MT9E013_LOW_FOV
+       bool "Micron mt9e013 sensor low FOV modes"
+       depends on VIDEO_MT9E013
+       default n
+       ---help---
+         Enable low field-of-view (FOV) modes for Micron mt9e013 sensor.

diff --git a/drivers/media/video/mt9e013/mt9e013_blackbay.h b/drivers/media/video/mt9e013/mt9e013_blackbay.h
index 79eb5c7..8cda3a5 100644 (file)
--- a/drivers/media/video/mt9e013/mt9e013_blackbay.h
+++ b/drivers/media/video/mt9e013/mt9e013_blackbay.h
@@ -296,6 +296,7 @@ static struct mt9e013_reg const mt9e013_PREVIEW1640_30fps[] = {
 };
 
 /*****************************video************************/
+#ifdef CONFIG_VIDEO_MT9E013_LOW_FOV
 static struct mt9e013_reg const mt9e013_1080p_strong_dvs_30fps[] = {
        /*      1080p strong dvs */
        GROUPED_PARAMETER_HOLD_ENABLE,
@@ -319,6 +320,31 @@ static struct mt9e013_reg const mt9e013_1080p_strong_dvs_30fps[] = {
        {MT9E013_16BIT, {0x0404},       0x0010  }, /*   SCALE_M 16 */
        {MT9E013_TOK_TERM, {0}, 0}
 };
+#endif
+
+static struct mt9e013_reg const enzofullhd_strong_dvs_30fps[] = {
+       /* enzofullhd_strong_dvs_30fps */
+       GROUPED_PARAMETER_HOLD_ENABLE,
+       /* Frame size & Timing Configuration*/
+       {MT9E013_16BIT, {0x0340}, 0x060E }, /* FRAME_LENGTH_LINES 1550 */
+       {MT9E013_16BIT, {0x0342}, 0x1020 }, /* LINE_LENGTH_PCK  4128 */
+       {MT9E013_16BIT, {0x0344}, 0x0000 }, /* X_ADDR_START     0 */
+       {MT9E013_16BIT, {0x0346}, 0x0114 }, /* Y_ADDR_START     276 */
+       {MT9E013_16BIT, {0x0348}, 0x0CCF }, /* X_ADDR_END       3279 */
+       {MT9E013_16BIT, {0x034A}, 0x088D }, /* Y_ADDR_END       2189 */
+       {MT9E013_16BIT, {0x034C}, 0x0668 }, /* X_OUTPUT_SIZE    1640 */
+       {MT9E013_16BIT, {0x034E}, 0x03BC }, /* Y_OUTPUT_SIZE    956 */
+       {MT9E013_16BIT, {0x3040}, 0x04C3 }, /* READ_MODE 0 0 1 0 0 1 0 3 3 */
+       {MT9E013_16BIT | MT9E013_RMW, {0x306E}, 0x0010, 0x1}, /* TRUE_BAYER */
+       /* Initial integration time */
+       {MT9E013_16BIT, {0x3010}, 0x0130 }, /* FINE_CORRECTION  304 */
+       {MT9E013_16BIT, {0X3012}, 0x0573 }, /* COARSE_INTEGRATION_TIME  1395 */
+       {MT9E013_16BIT, {0X3014}, 0x0846 }, /* FINE_INTEGRATION_TIME    2118 */
+       /* Scaler configuration */
+       {MT9E013_16BIT, {0x0400}, 0x0000 }, /* SCALE_MODE       0 */
+       {MT9E013_16BIT, {0x0404}, 0x0010 }, /* SCALE_M  16 */
+       {MT9E013_TOK_TERM, {0}, 0}
+};
 
 static struct mt9e013_reg const mt9e013_720p_strong_dvs_30fps[] = {
        /*      720p strong dvs */
@@ -751,6 +777,20 @@ static struct mt9e013_resolution mt9e013_res_video[] = {
                 .skip_frames = 0,
        },
        {
+                .desc =        "enzofullhd_strong_dvs_30fps",
+                .width =       1640    ,
+                .height =      956     ,
+                .fps =         30      ,
+                .used =        0       ,
+                .pixels_per_line = 0x1020, /* consistent with regs arrays */
+                .lines_per_frame = 0x060E, /* consistent with regs arrays */
+                .regs =        enzofullhd_strong_dvs_30fps     ,
+                .bin_factor_x =        1,
+                .bin_factor_y =        1,
+                .skip_frames = 0,
+       },
+#ifdef CONFIG_VIDEO_MT9E013_LOW_FOV
+       {
                 .desc =        "1080p_strong_dvs_30fps",
                 .width =       2336,
                 .height =      1308,
@@ -763,6 +803,7 @@ static struct mt9e013_resolution mt9e013_res_video[] = {
                 .bin_factor_y =        0,
                 .skip_frames = 0,
        },
+#endif
 };
 
 #define N_RES_VIDEO (ARRAY_SIZE(mt9e013_res_video))

diff --git a/drivers/media/video/mt9e013/mt9e013_enzo.h b/drivers/media/video/mt9e013/mt9e013_enzo.h
index da42bd0..01e22b9 100644 (file)
--- a/drivers/media/video/mt9e013/mt9e013_enzo.h
+++ b/drivers/media/video/mt9e013/mt9e013_enzo.h
@@ -279,6 +279,7 @@ static struct mt9e013_reg const mt9e013_WIDE_PREVIEW_30fps[] = {
 };
 
 /*****************************video************************/
+#ifdef CONFIG_VIDEO_MT9E013_LOW_FOV
 static struct mt9e013_reg const mt9e013_1080p_strong_dvs_30fps[] = {
        /*      1080p strong dvs */
        GROUPED_PARAMETER_HOLD_ENABLE,
@@ -302,6 +303,7 @@ static struct mt9e013_reg const mt9e013_1080p_strong_dvs_30fps[] = {
        {MT9E013_16BIT, {0x0404},       0x0010  }, /*   SCALE_M 16 */
        {MT9E013_TOK_TERM, {0}, 0}
 };
+#endif
 
 static struct mt9e013_reg const mt9e013_720p_strong_dvs_30fps[] = {
        /*      720p strong dvs */
@@ -743,6 +745,7 @@ static struct mt9e013_resolution mt9e013_res_video[] = {
                 .bin_factor_y =        1,
                 .skip_frames = 0,
        },
+#ifdef CONFIG_VIDEO_MT9E013_LOW_FOV
        {
                 .desc =        "1080p_strong_dvs_30fps",
                 .width =       2336,
@@ -756,6 +759,7 @@ static struct mt9e013_resolution mt9e013_res_video[] = {
                 .bin_factor_y =        0,
                 .skip_frames = 0,
        },
+#endif
        {
                 .desc =        "enzofullhd_strong_dvs_30fps",
                 .width =       1640    ,