mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-05 19:24:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

media: ov5604: Re-arrange modes definition

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

Cosmetic change only.

Signed-off-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Jacopo Mondi
2022-05-13 15:13:50 +01:00
committed by Mauro Carvalho Chehab
parent 22845bf2df
commit 8409d01707
1 changed files with 81 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

141
drivers/media/i2c/ov5640.c
View File

@@ -599,66 +599,87 @@ static const struct ov5640_mode_info ov5640_mode_init_data = {
static const struct ov5640_mode_info
ov5640_mode_data[OV5640_NUM_MODES] = {
{OV5640_MODE_QQVGA_160_120, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
160, 1896, 120, 984,
ov5640_setting_QQVGA_160_120,
ARRAY_SIZE(ov5640_setting_QQVGA_160_120),
OV5640_30_FPS},
{OV5640_MODE_QCIF_176_144, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
176, 1896, 144, 984,
ov5640_setting_QCIF_176_144,
ARRAY_SIZE(ov5640_setting_QCIF_176_144),
OV5640_30_FPS},
{OV5640_MODE_QVGA_320_240, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
320, 1896, 240, 984,
ov5640_setting_QVGA_320_240,
ARRAY_SIZE(ov5640_setting_QVGA_320_240),
OV5640_30_FPS},
{OV5640_MODE_VGA_640_480, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
640, 1896, 480, 1080,
ov5640_setting_VGA_640_480,
ARRAY_SIZE(ov5640_setting_VGA_640_480),
OV5640_60_FPS},
{OV5640_MODE_NTSC_720_480, SUBSAMPLING,
OV5640_PIXEL_RATE_96M,
720, 1896, 480, 984,
ov5640_setting_NTSC_720_480,
ARRAY_SIZE(ov5640_setting_NTSC_720_480),
OV5640_30_FPS},
{OV5640_MODE_PAL_720_576, SUBSAMPLING,
OV5640_PIXEL_RATE_96M,
720, 1896, 576, 984,
ov5640_setting_PAL_720_576,
ARRAY_SIZE(ov5640_setting_PAL_720_576),
OV5640_30_FPS},
{OV5640_MODE_XGA_1024_768, SUBSAMPLING,
OV5640_PIXEL_RATE_96M,
1024, 1896, 768, 1080,
ov5640_setting_XGA_1024_768,
ARRAY_SIZE(ov5640_setting_XGA_1024_768),
OV5640_30_FPS},
{OV5640_MODE_720P_1280_720, SUBSAMPLING,
OV5640_PIXEL_RATE_124M,
1280, 1892, 720, 740,
ov5640_setting_720P_1280_720,
ARRAY_SIZE(ov5640_setting_720P_1280_720),
OV5640_30_FPS},
{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},
{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},
{
/* 160x120 */
OV5640_MODE_QQVGA_160_120, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
160, 1896, 120, 984,
ov5640_setting_QQVGA_160_120,
ARRAY_SIZE(ov5640_setting_QQVGA_160_120),
OV5640_30_FPS
}, {
/* 176x144 */
OV5640_MODE_QCIF_176_144, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
176, 1896, 144, 984,
ov5640_setting_QCIF_176_144,
ARRAY_SIZE(ov5640_setting_QCIF_176_144),
OV5640_30_FPS
}, {
/* 320x240 */
OV5640_MODE_QVGA_320_240, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
320, 1896, 240, 984,
ov5640_setting_QVGA_320_240,
ARRAY_SIZE(ov5640_setting_QVGA_320_240),
OV5640_30_FPS
}, {
/* 640x480 */
OV5640_MODE_VGA_640_480, SUBSAMPLING,
OV5640_PIXEL_RATE_48M,
640, 1896, 480, 1080,
ov5640_setting_VGA_640_480,
ARRAY_SIZE(ov5640_setting_VGA_640_480),
OV5640_60_FPS
}, {
/* 720x480 */
OV5640_MODE_NTSC_720_480, SUBSAMPLING,
OV5640_PIXEL_RATE_96M,
720, 1896, 480, 984,
ov5640_setting_NTSC_720_480,
ARRAY_SIZE(ov5640_setting_NTSC_720_480),
OV5640_30_FPS
}, {
/* 720x576 */
OV5640_MODE_PAL_720_576, SUBSAMPLING,
OV5640_PIXEL_RATE_96M,
720, 1896, 576, 984,
ov5640_setting_PAL_720_576,
ARRAY_SIZE(ov5640_setting_PAL_720_576),
OV5640_30_FPS
}, {
/* 1024x768 */
OV5640_MODE_XGA_1024_768, SUBSAMPLING,
OV5640_PIXEL_RATE_96M,
1024, 1896, 768, 1080,
ov5640_setting_XGA_1024_768,
ARRAY_SIZE(ov5640_setting_XGA_1024_768),
OV5640_30_FPS
}, {
/* 1280x720 */
OV5640_MODE_720P_1280_720, SUBSAMPLING,
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)