From 22a6db6182bbd5b98f7637b16805403a35082ff4 Mon Sep 17 00:00:00 2001 From: Bryan Wu Date: Thu, 14 Apr 2016 15:54:27 -0700 Subject: media: imx274: add resolution, frame rate, code Bug 1736471 Change-Id: Ieb8522b195fb0d34de52ecae489b4bf3c7f2fbcc Signed-off-by: Bhanu Murthy V Reviewed-on: http://git-master/r/1127009 (cherry picked from commit fcc57a0ab973a56408c8e045395bf18e4b87488b) Reviewed-on: http://git-master/r/1147738 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Jihoon Bang --- drivers/media/i2c/imx274.c | 6 ++++-- drivers/media/i2c/imx274_mode_tbls.h | 11 ++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'drivers/media') diff --git a/drivers/media/i2c/imx274.c b/drivers/media/i2c/imx274.c index 53cd8cb9c..e1f646f40 100644 --- a/drivers/media/i2c/imx274.c +++ b/drivers/media/i2c/imx274.c @@ -524,6 +524,8 @@ static struct v4l2_subdev_video_ops imx274_subdev_video_ops = { .enum_mbus_fmt = camera_common_enum_fmt, .g_mbus_config = camera_common_g_mbus_config, .g_input_status = imx274_g_input_status, + .enum_framesizes = camera_common_enum_framesizes, + .enum_frameintervals = camera_common_enum_frameintervals, }; static struct v4l2_subdev_core_ops imx274_subdev_core_ops = { @@ -662,8 +664,8 @@ static int imx274_calculate_shr(struct imx274 *priv, u32 rep) int shr; int min; int max; - u32 vmax_l; - u32 vmax_m; + u8 vmax_l; + u8 vmax_m; u32 vmax; imx274_read_reg(priv->s_data, IMX274_SVR_ADDR, &svr); diff --git a/drivers/media/i2c/imx274_mode_tbls.h b/drivers/media/i2c/imx274_mode_tbls.h index c86a5d70f..64a2d9e65 100644 --- a/drivers/media/i2c/imx274_mode_tbls.h +++ b/drivers/media/i2c/imx274_mode_tbls.h @@ -408,9 +408,14 @@ static const imx274_reg *mode_table[] = { [IMX274_MODE_TEST_PATTERN] = tp_colorbars, }; +static const int imx274_framerates[] = { + 30, + 60, +}; + static const struct camera_common_frmfmt imx274_frmfmt[] = { - {{3840, 2160}, 0, IMX274_MODE_3840X2160}, - {{1920, 1080}, 0, IMX274_MODE_1920X1080}, - {{1280, 720}, 0, IMX274_MODE_1280X720}, + {{3840, 2160}, imx274_framerates, 2, 0, IMX274_MODE_3840X2160}, + {{1920, 1080}, imx274_framerates, 2, 0, IMX274_MODE_1920X1080}, + {{1280, 720}, imx274_framerates, 2, 0, IMX274_MODE_1280X720}, }; #endif /* __IMX274_I2C_TABLES__ */ -- cgit v1.2.2