media: imx274: Add frame rate in format

Add frame size in format, which adds 60fps for all sensor modes.
The resolution in format needs to match with default width and height.

These change fixes below v4l2 compliance and vi mode failure

INFO: No frame size specified (--nv --width [width] --height [height]).
fail: Video Capture: TRY_FMT(G_FMT) != G_FMT

Bug 200182641
Bug 200234298

Change-Id: I0aca164c28d767c06a9ea07670d20ff3a288977f
Signed-off-by: Josh Kuo <joshk@nvidia.com>
Reviewed-on: http://git-master/r/1264704
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

2 files changed, 10 insertions, 7 deletions

diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c
index d55a27f16..763629bb2 100644
--- a/drivers/media/i2c/imx274.c
+++ b/drivers/media/i2c/imx274.c
@@ -1,7 +1,7 @@
 /*
  * imx274.c - imx274 sensor driver
  *
- * Copyright (c) 2015-2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -49,8 +49,8 @@
 
 #define IMX274_DEFAULT_MODE     IMX274_MODE_3840X2160
 
-#define IMX274_DEFAULT_WIDTH    3840
-#define IMX274_DEFAULT_HEIGHT   2160
+#define IMX274_DEFAULT_WIDTH    3864
+#define IMX274_DEFAULT_HEIGHT   2174
 #define IMX274_DEFAULT_DATAFMT  MEDIA_BUS_FMT_SRGGB10_1X10
 #define IMX274_DEFAULT_CLK_FREQ 24000000
 
diff --git a/drivers/media/i2c/imx274_mode_tbls.h b/drivers/media/i2c/imx274_mode_tbls.h
index fcca28e31..81ca2a289 100644
--- a/drivers/media/i2c/imx274_mode_tbls.h
+++ b/drivers/media/i2c/imx274_mode_tbls.h
@@ -414,14 +414,17 @@ static const imx274_reg *mode_table[] = {
         [IMX274_MODE_TEST_PATTERN]              = tp_colorbars,
 };
 
-static const int imx274_framerates[] = {
+static const int imx274_30_fr[] = {
         30,
+};
+
+static const int imx274_60_fr[] = {
         60,
 };
 
 static const struct camera_common_frmfmt imx274_frmfmt[] = {
-        {{3864, 2174},  0, IMX274_MODE_3840X2160},
-        {{1920, 1080},  0, IMX274_MODE_1920X1080},
-        {{1280, 720},   0, IMX274_MODE_1280X720},
+        {{3864, 2174}, imx274_60_fr, 1, 0, IMX274_MODE_3840X2160},
+        {{1920, 1080}, imx274_60_fr, 1, 0, IMX274_MODE_1920X1080},
+        {{1280, 720},  imx274_60_fr, 1, 0, IMX274_MODE_1280X720},
 };
 #endif  /* __IMX274_I2C_TABLES__ */