xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[media] ov2640: add support for MEDIA_BUS_FMT_YVYU8_2X8 and MEDIA_BUS_FMT_VYUY8_2X8

Browse Source 
Signed-off-by: Frank Schäfer <fschaefer.oss@googlemail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Frank Schaefer
2017-04-16 14:35:46 -03:00
committed by Mauro Carvalho Chehab
parent 7f140fc206
commit d72b196f96
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/media/i2c/ov2640.c
View File

@@ -634,6 +634,8 @@ static const struct regval_list ov2640_rgb565_le_regs[] = {
static u32 ov2640_codes[] = { static u32 ov2640_codes[] = {
MEDIA_BUS_FMT_YUYV8_2X8, MEDIA_BUS_FMT_YUYV8_2X8,
MEDIA_BUS_FMT_UYVY8_2X8, MEDIA_BUS_FMT_UYVY8_2X8,
MEDIA_BUS_FMT_YVYU8_2X8,
MEDIA_BUS_FMT_VYUY8_2X8,
MEDIA_BUS_FMT_RGB565_2X8_BE, MEDIA_BUS_FMT_RGB565_2X8_BE,
MEDIA_BUS_FMT_RGB565_2X8_LE, MEDIA_BUS_FMT_RGB565_2X8_LE,
}; };
@@ -798,6 +800,7 @@ static int ov2640_set_params(struct i2c_client *client,
{ {
struct ov2640_priv *priv = to_ov2640(client); struct ov2640_priv *priv = to_ov2640(client);
const struct regval_list *selected_cfmt_regs; const struct regval_list *selected_cfmt_regs;
u8 val;
int ret; int ret;
/* select win */ /* select win */
@@ -823,6 +826,14 @@ static int ov2640_set_params(struct i2c_client *client,
dev_dbg(&client->dev, "%s: Selected cfmt UYVY", __func__); dev_dbg(&client->dev, "%s: Selected cfmt UYVY", __func__);
selected_cfmt_regs = ov2640_uyvy_regs; selected_cfmt_regs = ov2640_uyvy_regs;
break; break;
case MEDIA_BUS_FMT_YVYU8_2X8:
dev_dbg(&client->dev, "%s: Selected cfmt YVYU", __func__);
selected_cfmt_regs = ov2640_yuyv_regs;
break;
case MEDIA_BUS_FMT_VYUY8_2X8:
dev_dbg(&client->dev, "%s: Selected cfmt VYUY", __func__);
selected_cfmt_regs = ov2640_uyvy_regs;
break;
} }
/* reset hardware */ /* reset hardware */
@@ -853,6 +864,11 @@ static int ov2640_set_params(struct i2c_client *client,
/* set cfmt */ /* set cfmt */
ret = ov2640_write_array(client, selected_cfmt_regs); ret = ov2640_write_array(client, selected_cfmt_regs);
if (ret < 0)
goto err;
val = (code == MEDIA_BUS_FMT_YVYU8_2X8)
|| (code == MEDIA_BUS_FMT_VYUY8_2X8) ? CTRL0_VFIRST : 0x00;
ret = ov2640_mask_set(client, CTRL0, CTRL0_VFIRST, val);
if (ret < 0) if (ret < 0)
goto err; goto err;
@@ -917,6 +933,8 @@ static int ov2640_set_fmt(struct v4l2_subdev *sd,
case MEDIA_BUS_FMT_RGB565_2X8_LE: case MEDIA_BUS_FMT_RGB565_2X8_LE:
case MEDIA_BUS_FMT_YUYV8_2X8: case MEDIA_BUS_FMT_YUYV8_2X8:
case MEDIA_BUS_FMT_UYVY8_2X8: case MEDIA_BUS_FMT_UYVY8_2X8:
case MEDIA_BUS_FMT_YVYU8_2X8:
case MEDIA_BUS_FMT_VYUY8_2X8:
break; break;
default: default:
mf->code = MEDIA_BUS_FMT_UYVY8_2X8; mf->code = MEDIA_BUS_FMT_UYVY8_2X8;