From 3d478b8b6facf1b4b381e5c0f782f341a87e56ff Mon Sep 17 00:00:00 2001 From: Ondrej Jirman Date: Fri, 24 Jan 2020 18:25:12 +0100 Subject: [PATCH 051/323] media: ov5640: Add more framerates to the driver (some of them even work!) Signed-off-by: Ondrej Jirman --- drivers/media/i2c/ov5640.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/drivers/media/i2c/ov5640.c b/drivers/media/i2c/ov5640.c index 8f0812e85..b3087ec9f 100644 --- a/drivers/media/i2c/ov5640.c +++ b/drivers/media/i2c/ov5640.c @@ -111,7 +111,11 @@ enum ov5640_mode_id { }; enum ov5640_frame_rate { - OV5640_15_FPS = 0, + OV5640_2_FPS = 0, + OV5640_3_FPS, + OV5640_5_FPS, + OV5640_7_FPS, + OV5640_15_FPS, OV5640_30_FPS, OV5640_60_FPS, OV5640_NUM_FRAMERATES, @@ -153,6 +157,10 @@ MODULE_PARM_DESC(virtual_channel, "MIPI CSI-2 virtual channel (0..3), default 0"); static const int ov5640_framerates[] = { + [OV5640_2_FPS] = 2, + [OV5640_3_FPS] = 3, + [OV5640_5_FPS] = 5, + [OV5640_7_FPS] = 7, [OV5640_15_FPS] = 15, [OV5640_30_FPS] = 30, [OV5640_60_FPS] = 60, @@ -2167,11 +2175,11 @@ static int ov5640_try_frame_interval(struct ov5640_dev *sensor, u32 width, u32 height) { const struct ov5640_mode_info *mode; - enum ov5640_frame_rate rate = OV5640_15_FPS; + enum ov5640_frame_rate rate = OV5640_2_FPS; int minfps, maxfps, best_fps, fps; int i; - minfps = ov5640_framerates[OV5640_15_FPS]; + minfps = ov5640_framerates[OV5640_2_FPS]; maxfps = ov5640_framerates[OV5640_60_FPS]; if (fi->numerator == 0) { -- 2.34.0