aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinaro CI <ci_notify@linaro.org>2020-12-02 06:11:37 +0000
committerLinaro CI <ci_notify@linaro.org>2020-12-02 06:11:37 +0000
commit6c9d5f137f0552ff6d5cd246590c545e479e8e2c (patch)
tree43a0a3d1223e233ddc6ffae37d502458536f8d56
parent167aca0d0b3b5f28860fbcee8333280a87eb167a (diff)
parent129555a6197f834e6b166f7f1c5e3fbee4ebabfd (diff)
Merge remote-tracking branch 'ov8856-bayer-mode/tracking-qcomlt-ov8856-bayer-mode' into integration-linux-qcomlt
-rw-r--r--drivers/media/i2c/ov8856.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/drivers/media/i2c/ov8856.c b/drivers/media/i2c/ov8856.c
index 2f4ceaa80593..a2dcbece558c 100644
--- a/drivers/media/i2c/ov8856.c
+++ b/drivers/media/i2c/ov8856.c
@@ -1281,8 +1281,13 @@ static void ov8856_update_pad_format(const struct ov8856_mode *mode,
{
fmt->width = mode->width;
fmt->height = mode->height;
- fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
fmt->field = V4L2_FIELD_NONE;
+
+ if (mode->reg_list.regs == mode_3264x2448_regs ||
+ mode->reg_list.regs == mode_1632x1224_regs)
+ fmt->code = MEDIA_BUS_FMT_SBGGR10_1X10;
+ else
+ fmt->code = MEDIA_BUS_FMT_SGRBG10_1X10;
}
static int ov8856_start_streaming(struct ov8856 *ov8856)