diff options
| author | Josh Kuo <joshk@nvidia.com> | 2016-12-04 22:42:14 -0500 |
|---|---|---|
| committer | Bhanu Murthy V <bmurthyv@nvidia.com> | 2017-03-22 13:36:40 -0400 |
| commit | 6e068f7935d5c5ac85bb1e9690c3bc54480d1ecd (patch) | |
| tree | d1e75edd2e9c8686cfe4e7fe9e128171fc170e54 /drivers/media/i2c/imx274.c | |
| parent | b58da711c608b1be3eb6b1e57881a2c706065558 (diff) | |
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>
Diffstat (limited to 'drivers/media/i2c/imx274.c')
| -rw-r--r-- | drivers/media/i2c/imx274.c | 6 |
1 files changed, 3 insertions, 3 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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * imx274.c - imx274 sensor driver | 2 | * imx274.c - imx274 sensor driver |
| 3 | * | 3 | * |
| 4 | * Copyright (c) 2015-2016, NVIDIA CORPORATION. All rights reserved. | 4 | * Copyright (c) 2015-2017, NVIDIA CORPORATION. All rights reserved. |
| 5 | * | 5 | * |
| 6 | * This program is free software; you can redistribute it and/or modify it | 6 | * This program is free software; you can redistribute it and/or modify it |
| 7 | * under the terms and conditions of the GNU General Public License, | 7 | * under the terms and conditions of the GNU General Public License, |
| @@ -49,8 +49,8 @@ | |||
| 49 | 49 | ||
| 50 | #define IMX274_DEFAULT_MODE IMX274_MODE_3840X2160 | 50 | #define IMX274_DEFAULT_MODE IMX274_MODE_3840X2160 |
| 51 | 51 | ||
| 52 | #define IMX274_DEFAULT_WIDTH 3840 | 52 | #define IMX274_DEFAULT_WIDTH 3864 |
| 53 | #define IMX274_DEFAULT_HEIGHT 2160 | 53 | #define IMX274_DEFAULT_HEIGHT 2174 |
| 54 | #define IMX274_DEFAULT_DATAFMT MEDIA_BUS_FMT_SRGGB10_1X10 | 54 | #define IMX274_DEFAULT_DATAFMT MEDIA_BUS_FMT_SRGGB10_1X10 |
| 55 | #define IMX274_DEFAULT_CLK_FREQ 24000000 | 55 | #define IMX274_DEFAULT_CLK_FREQ 24000000 |
| 56 | 56 | ||