Commit 8409d017 authored by Jacopo Mondi's avatar Jacopo Mondi Committed by Mauro Carvalho Chehab

media: ov5604: Re-arrange modes definition

The array of supported modes is close to unreadable.
Re-arrange it giving it some room to breath.

Cosmetic change only.
Signed-off-by: default avatarJacopo Mondi <jacopo@jmondi.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarSakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 22845bf2
...@@ -599,66 +599,87 @@ static const struct ov5640_mode_info ov5640_mode_init_data = { ...@@ -599,66 +599,87 @@ static const struct ov5640_mode_info ov5640_mode_init_data = {
static const struct ov5640_mode_info static const struct ov5640_mode_info
ov5640_mode_data[OV5640_NUM_MODES] = { ov5640_mode_data[OV5640_NUM_MODES] = {
{OV5640_MODE_QQVGA_160_120, SUBSAMPLING, {
OV5640_PIXEL_RATE_48M, /* 160x120 */
160, 1896, 120, 984, OV5640_MODE_QQVGA_160_120, SUBSAMPLING,
ov5640_setting_QQVGA_160_120, OV5640_PIXEL_RATE_48M,
ARRAY_SIZE(ov5640_setting_QQVGA_160_120), 160, 1896, 120, 984,
OV5640_30_FPS}, ov5640_setting_QQVGA_160_120,
{OV5640_MODE_QCIF_176_144, SUBSAMPLING, ARRAY_SIZE(ov5640_setting_QQVGA_160_120),
OV5640_PIXEL_RATE_48M, OV5640_30_FPS
176, 1896, 144, 984, }, {
ov5640_setting_QCIF_176_144, /* 176x144 */
ARRAY_SIZE(ov5640_setting_QCIF_176_144), OV5640_MODE_QCIF_176_144, SUBSAMPLING,
OV5640_30_FPS}, OV5640_PIXEL_RATE_48M,
{OV5640_MODE_QVGA_320_240, SUBSAMPLING, 176, 1896, 144, 984,
OV5640_PIXEL_RATE_48M, ov5640_setting_QCIF_176_144,
320, 1896, 240, 984, ARRAY_SIZE(ov5640_setting_QCIF_176_144),
ov5640_setting_QVGA_320_240, OV5640_30_FPS
ARRAY_SIZE(ov5640_setting_QVGA_320_240), }, {
OV5640_30_FPS}, /* 320x240 */
{OV5640_MODE_VGA_640_480, SUBSAMPLING, OV5640_MODE_QVGA_320_240, SUBSAMPLING,
OV5640_PIXEL_RATE_48M, OV5640_PIXEL_RATE_48M,
640, 1896, 480, 1080, 320, 1896, 240, 984,
ov5640_setting_VGA_640_480, ov5640_setting_QVGA_320_240,
ARRAY_SIZE(ov5640_setting_VGA_640_480), ARRAY_SIZE(ov5640_setting_QVGA_320_240),
OV5640_60_FPS}, OV5640_30_FPS
{OV5640_MODE_NTSC_720_480, SUBSAMPLING, }, {
OV5640_PIXEL_RATE_96M, /* 640x480 */
720, 1896, 480, 984, OV5640_MODE_VGA_640_480, SUBSAMPLING,
ov5640_setting_NTSC_720_480, OV5640_PIXEL_RATE_48M,
ARRAY_SIZE(ov5640_setting_NTSC_720_480), 640, 1896, 480, 1080,
OV5640_30_FPS}, ov5640_setting_VGA_640_480,
{OV5640_MODE_PAL_720_576, SUBSAMPLING, ARRAY_SIZE(ov5640_setting_VGA_640_480),
OV5640_PIXEL_RATE_96M, OV5640_60_FPS
720, 1896, 576, 984, }, {
ov5640_setting_PAL_720_576, /* 720x480 */
ARRAY_SIZE(ov5640_setting_PAL_720_576), OV5640_MODE_NTSC_720_480, SUBSAMPLING,
OV5640_30_FPS}, OV5640_PIXEL_RATE_96M,
{OV5640_MODE_XGA_1024_768, SUBSAMPLING, 720, 1896, 480, 984,
OV5640_PIXEL_RATE_96M, ov5640_setting_NTSC_720_480,
1024, 1896, 768, 1080, ARRAY_SIZE(ov5640_setting_NTSC_720_480),
ov5640_setting_XGA_1024_768, OV5640_30_FPS
ARRAY_SIZE(ov5640_setting_XGA_1024_768), }, {
OV5640_30_FPS}, /* 720x576 */
{OV5640_MODE_720P_1280_720, SUBSAMPLING, OV5640_MODE_PAL_720_576, SUBSAMPLING,
OV5640_PIXEL_RATE_124M, OV5640_PIXEL_RATE_96M,
1280, 1892, 720, 740, 720, 1896, 576, 984,
ov5640_setting_720P_1280_720, ov5640_setting_PAL_720_576,
ARRAY_SIZE(ov5640_setting_720P_1280_720), ARRAY_SIZE(ov5640_setting_PAL_720_576),
OV5640_30_FPS}, OV5640_30_FPS
{OV5640_MODE_1080P_1920_1080, SCALING, }, {
OV5640_PIXEL_RATE_148M, /* 1024x768 */
1920, 2500, 1080, 1120, OV5640_MODE_XGA_1024_768, SUBSAMPLING,
ov5640_setting_1080P_1920_1080, OV5640_PIXEL_RATE_96M,
ARRAY_SIZE(ov5640_setting_1080P_1920_1080), 1024, 1896, 768, 1080,
OV5640_30_FPS}, ov5640_setting_XGA_1024_768,
{OV5640_MODE_QSXGA_2592_1944, SCALING, ARRAY_SIZE(ov5640_setting_XGA_1024_768),
OV5640_PIXEL_RATE_168M, OV5640_30_FPS
2592, 2844, 1944, 1968, }, {
ov5640_setting_QSXGA_2592_1944, /* 1280x720 */
ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944), OV5640_MODE_720P_1280_720, SUBSAMPLING,
OV5640_15_FPS}, OV5640_PIXEL_RATE_124M,
1280, 1892, 720, 740,
ov5640_setting_720P_1280_720,
ARRAY_SIZE(ov5640_setting_720P_1280_720),
OV5640_30_FPS
}, {
/* 1920x1080 */
OV5640_MODE_1080P_1920_1080, SCALING,
OV5640_PIXEL_RATE_148M,
1920, 2500, 1080, 1120,
ov5640_setting_1080P_1920_1080,
ARRAY_SIZE(ov5640_setting_1080P_1920_1080),
OV5640_30_FPS
}, {
/* 2592x1944 */
OV5640_MODE_QSXGA_2592_1944, SCALING,
OV5640_PIXEL_RATE_168M,
2592, 2844, 1944, 1968,
ov5640_setting_QSXGA_2592_1944,
ARRAY_SIZE(ov5640_setting_QSXGA_2592_1944),
OV5640_15_FPS
},
}; };
static int ov5640_init_slave_id(struct ov5640_dev *sensor) static int ov5640_init_slave_id(struct ov5640_dev *sensor)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment