diff options
author | Linaro CI <ci_notify@linaro.org> | 2020-12-20 21:51:46 +0000 |
---|---|---|
committer | Linaro CI <ci_notify@linaro.org> | 2020-12-20 21:51:46 +0000 |
commit | 8b2aace2ccffa0aa742bedaf18790fb6ac0ef5fb (patch) | |
tree | bf2ff9fd8c0adcb1e7ea7685b0c5f1bf46fa2a09 | |
parent | 6e32fca68016ca26d51efd8a5043b4cca89d64e2 (diff) | |
parent | 129555a6197f834e6b166f7f1c5e3fbee4ebabfd (diff) |
Merge remote-tracking branch 'ov8856-bayer-mode/tracking-qcomlt-ov8856-bayer-mode' into integration-linux-qcomlt
-rw-r--r-- | drivers/media/i2c/ov8856.c | 7 |
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) |