atomisp: mt9e013: Remove D1 resolutions from Aptina mt9e013 driver

BZ: 28819

Remove D1 resolutions from Aptina mt9e013 driver

Change-Id: I862d7bc185f4da6710055da51cfdc74229605ea6
Reviewed-on: http://android.intel.com:8080/42918
Reviewed-by: Wang, Wen W <wen.w.wang@intel.com>
Reviewed-by: Lampila, KalleX <kallex.lampila@intel.com>
Tested-by: Lampila, KalleX <kallex.lampila@intel.com>
Reviewed-by: Cohen, David A <david.a.cohen@intel.com>
Reviewed-by: buildbot <buildbot@intel.com>
Tested-by: buildbot <buildbot@intel.com>

diff --git a/drivers/media/video/mt9e013.c b/drivers/media/video/mt9e013.c
index c35b319..3150781 100644 (file)
--- a/drivers/media/video/mt9e013.c
+++ b/drivers/media/video/mt9e013.c
@@ -184,30 +184,6 @@ static struct mt9e013_resolution mt9e013_res_video[] = {
                 .skip_frames = 1,
        },
        {
-                .desc =        "mt9e013_D1PAL_strong_dvs_30fps"        ,
-                .width =       880     ,
-                .height =      708     ,
-                .fps =         30      ,
-                .used =        0       ,
-                .pixels_per_line = 0x1020, /* consistent with regs arrays */
-                .lines_per_frame = 0x060E, /* consistent with regs arrays */
-                .regs =        mt9e013_D1PAL_strong_dvs_30fps  ,
-                .bin_factor_x =        2,
-                .bin_factor_y =        2,
-       },
-       {
-                .desc =        "mt9e013_D1NTSC_strong_dvs_30fps"       ,
-                .width =       904     ,
-                .height =      602     ,
-                .fps =         30      ,
-                .used =        0       ,
-                .pixels_per_line = 0x1020, /* consistent with regs arrays */
-                .lines_per_frame = 0x060E, /* consistent with regs arrays */
-                .regs =        mt9e013_D1NTSC_strong_dvs_30fps ,
-                .bin_factor_x =        2,
-                .bin_factor_y =        2,
-       },
-       {
                 .desc =        "WVGA_strong_dvs_30fps" ,
                 .width =       1640    ,
                 .height =      1024    ,

diff --git a/drivers/media/video/mt9e013.h b/drivers/media/video/mt9e013.h
index 6dc4fb7..0904cbd 100644 (file)
--- a/drivers/media/video/mt9e013.h
+++ b/drivers/media/video/mt9e013.h
@@ -740,54 +740,6 @@ static struct mt9e013_reg const mt9e013_WVGA_strong_dvs_30fps[] = {
        {MT9E013_TOK_TERM, {0}, 0}
 };
 
-static struct mt9e013_reg const mt9e013_D1PAL_strong_dvs_30fps[] = {
-       /*      D1PAL strong dvs */
-       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},       0x0134  }, /*   X_ADDR_START    308 */
-       {MT9E013_16BIT, {0x0346},       0x0024  }, /*   Y_ADDR_START    36 */
-       {MT9E013_16BIT, {0x0348},       0x0B9B  }, /*   X_ADDR_END      2971 */
-       {MT9E013_16BIT, {0x034A},       0x0957  }, /*   Y_ADDR_END      2391 */
-       {MT9E013_16BIT, {0x034C},       0x0370  }, /*   X_OUTPUT_SIZE   880 */
-       {MT9E013_16BIT, {0x034E},       0x02C4  }, /*   Y_OUTPUT_SIZE   708 */
-       {MT9E013_16BIT, {0x3040},       0x04C3  }, /*   READ_MODE       0 0 0 0 0 1 0 3 3 */
-       {MT9E013_16BIT | MT9E013_RMW, {0x306E}, 0x0010, 0x1}, /* DATAPATH_SELECT_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},       0x0002  }, /*   SCALE_MODE      2 */
-       {MT9E013_16BIT, {0x0404},       0x001B  }, /*   SCALE_M 27 */
-       {MT9E013_TOK_TERM, {0}, 0}
-};
-
-static struct mt9e013_reg const mt9e013_D1NTSC_strong_dvs_30fps[] = {
-       /*      D1NTSC strong dvs */
-       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},       0x008C  }, /*   Y_ADDR_START    140 */
-       {MT9E013_16BIT, {0x0348},       0x0CCF  }, /*   X_ADDR_END      3279 */
-       {MT9E013_16BIT, {0x034A},       0x0887  }, /*   Y_ADDR_END       2183 */
-       {MT9E013_16BIT, {0x034C},       0x0388  }, /*   X_OUTPUT_SIZE   904 */
-       {MT9E013_16BIT, {0x034E},       0x025A  }, /*   Y_OUTPUT_SIZE   602 */
-       {MT9E013_16BIT, {0x3040},       0x04C3  }, /*   READ_MODE       0 0 0 0 0 1 0 3 3 */
-       {MT9E013_16BIT | MT9E013_RMW, {0x306E}, 0x0010, 0x1}, /* DATAPATH_SELECT_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},       0x0002  }, /*   SCALE_MODE      2 */
-       {MT9E013_16BIT, {0x0404},       0x001D  }, /*   SCALE_M 29 */
-       {MT9E013_TOK_TERM, {0}, 0}
-};
-
 static struct mt9e013_reg const mt9e013_VGA_strong_dvs_30fps[] = {
        /*      VGA strong dvs */
        GROUPED_PARAMETER_HOLD_ENABLE,