Skip to content

L
linux
Commit ef6504af authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files
Options

media: atomisp: ov2680: Drop struct ov2680_resolution / ov2680_res_preview 

Drop struct ov2680_resolution and the ov2680_res_preview[] array,
this is now only used in ov2680_enum_frame_size() and only
the width + height are used there.

Replace this with a new struct v4l2_frmsize_discrete ov2680_frame_sizes[]
array.

No functional changes.
Reviewed-by: default avatarAndy Shevchenko <andy@kernel.org>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent f4ed8e3b
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 615 deletions
drivers/staging/media/atomisp/i2c/atomisp-ov2680.c
View file @ ef6504af
...@@ -691,15 +691,29 @@ static int ov2680_enum_frame_size(struct v4l2_subdev *sd, ...@@ -691,15 +691,29 @@ static int ov2680_enum_frame_size(struct v4l2_subdev *sd,
struct v4l2_subdev_state *sd_state, struct v4l2_subdev_state *sd_state,
struct v4l2_subdev_frame_size_enum *fse) struct v4l2_subdev_frame_size_enum *fse)
{ {
static const struct v4l2_frmsize_discrete ov2680_frame_sizes[] = {
{ 1616, 1216 },
{ 1616, 1082 },
{ 1616, 916 },
{ 1456, 1096 },
{ 1296, 976 },
{ 1296, 736 },
{ 800, 600 },
{ 720, 592 },
{ 656, 496 },
{ 336, 256 },
{ 352, 288 },
{ 176, 144 },
};
int index = fse->index; int index = fse->index;
if (index >= N_RES_PREVIEW) if (index >= ARRAY_SIZE(ov2680_frame_sizes))
return -EINVAL; return -EINVAL;
fse->min_width = ov2680_res_preview[index].width; fse->min_width = ov2680_frame_sizes[index].width;
fse->min_height = ov2680_res_preview[index].height; fse->min_height = ov2680_frame_sizes[index].height;
fse->max_width = ov2680_res_preview[index].width; fse->max_width = ov2680_frame_sizes[index].width;
fse->max_height = ov2680_res_preview[index].height; fse->max_height = ov2680_frame_sizes[index].height;
return 0; return 0;
} }
......
drivers/staging/media/atomisp/i2c/ov2680.h
View file @ ef6504af
...@@ -148,18 +148,6 @@ struct regval_list { ...@@ -148,18 +148,6 @@ struct regval_list {
u8 value; u8 value;
}; };
struct ov2680_resolution {
const struct ov2680_reg *regs;
int res;
int width;
int height;
int fps;
int pix_clk_freq;
u32 skip_frames;
u16 pixels_per_line;
u16 lines_per_frame;
};
struct ov2680_format { struct ov2680_format {
u8 *desc; u8 *desc;
u32 pixelformat; u32 pixelformat;
...@@ -316,602 +304,4 @@ static struct ov2680_reg const ov2680_global_setting[] = { ...@@ -316,602 +304,4 @@ static struct ov2680_reg const ov2680_global_setting[] = {
{} {}
}; };
/*
* 176x144 30fps VBlanking 1lane 10Bit (binning)
*/
static struct ov2680_reg const ov2680_QCIF_30fps[] = {
{0x3086, 0x01},
{0x370a, 0x23},
{0x3801, 0xa0},
{0x3802, 0x00},
{0x3803, 0x78},
{0x3804, 0x05},
{0x3805, 0xaf},
{0x3806, 0x04},
{0x3807, 0x47},
{0x3808, 0x00},
{0x3809, 0xC0},
{0x380a, 0x00},
{0x380b, 0xa0},
{0x380c, 0x06},
{0x380d, 0xb0},
{0x3810, 0x00},
{0x3811, 0x04},
{0x3812, 0x00},
{0x3813, 0x04},
{0x3814, 0x31},
{0x3815, 0x31},
{0x4000, 0x81},
{0x4001, 0x40},
{0x4008, 0x00},
{0x4009, 0x03},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x00},
{0x5705, 0xc0},
{0x5706, 0x00},
{0x5707, 0xa0},
{0x3820, 0xc2},
{0x3821, 0x01},
// {0x5090, 0x0c},
{}
};
/*
* 352x288 30fps VBlanking 1lane 10Bit (binning)
*/
static struct ov2680_reg const ov2680_CIF_30fps[] = {
{0x3086, 0x01},
{0x370a, 0x23},
{0x3801, 0xa0},
{0x3802, 0x00},
{0x3803, 0x78},
{0x3804, 0x03},
{0x3805, 0x8f},
{0x3806, 0x02},
{0x3807, 0xe7},
{0x3808, 0x01},
{0x3809, 0x70},
{0x380a, 0x01},
{0x380b, 0x30},
{0x380c, 0x06},
{0x380d, 0xb0},
{0x3810, 0x00},
{0x3811, 0x04},
{0x3812, 0x00},
{0x3813, 0x04},
{0x3814, 0x31},
{0x3815, 0x31},
{0x4008, 0x00},
{0x4009, 0x03},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x01},
{0x5705, 0x70},
{0x5706, 0x01},
{0x5707, 0x30},
{0x3820, 0xc2},
{0x3821, 0x01},
// {0x5090, 0x0c},
{}
};
/*
* 336x256 30fps VBlanking 1lane 10Bit (binning)
*/
static struct ov2680_reg const ov2680_QVGA_30fps[] = {
{0x3086, 0x01},
{0x370a, 0x23},
{0x3801, 0xa0},
{0x3802, 0x00},
{0x3803, 0x78},
{0x3804, 0x03},
{0x3805, 0x4f},
{0x3806, 0x02},
{0x3807, 0x87},
{0x3808, 0x01},
{0x3809, 0x50},
{0x380a, 0x01},
{0x380b, 0x00},
{0x380c, 0x06},
{0x380d, 0xb0},
{0x3810, 0x00},
{0x3811, 0x04},
{0x3812, 0x00},
{0x3813, 0x04},
{0x3814, 0x31},
{0x3815, 0x31},
{0x4008, 0x00},
{0x4009, 0x03},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x01},
{0x5705, 0x50},
{0x5706, 0x01},
{0x5707, 0x00},
{0x3820, 0xc2},
{0x3821, 0x01},
// {0x5090, 0x0c},
{}
};
/*
* 656x496 30fps VBlanking 1lane 10Bit (binning)
*/
static struct ov2680_reg const ov2680_656x496_30fps[] = {
{0x3086, 0x01},
{0x370a, 0x23},
{0x3801, 0xa0},
{0x3802, 0x00},
{0x3803, 0x78},
{0x3804, 0x05},
{0x3805, 0xcf},
{0x3806, 0x04},
{0x3807, 0x67},
{0x3808, 0x02},
{0x3809, 0x90},
{0x380a, 0x01},
{0x380b, 0xf0},
{0x380c, 0x06},
{0x380d, 0xb0},
{0x3810, 0x00},
{0x3811, 0x04},
{0x3812, 0x00},
{0x3813, 0x04},
{0x3814, 0x31},
{0x3815, 0x31},
{0x4008, 0x00},
{0x4009, 0x03},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x02},
{0x5705, 0x90},
{0x5706, 0x01},
{0x5707, 0xf0},
{0x3820, 0xc2},
{0x3821, 0x01},
// {0x5090, 0x0c},
{}
};
/*
* 720x592 30fps VBlanking 1lane 10Bit (binning)
*/
static struct ov2680_reg const ov2680_720x592_30fps[] = {
{0x3086, 0x01},
{0x370a, 0x23},
{0x3801, 0x00}, // X_ADDR_START;
{0x3802, 0x00},
{0x3803, 0x00}, // Y_ADDR_START;
{0x3804, 0x05},
{0x3805, 0xaf}, // X_ADDR_END;
{0x3806, 0x04},
{0x3807, 0xaf}, // Y_ADDR_END;
{0x3808, 0x02},
{0x3809, 0xd0}, // X_OUTPUT_SIZE;
{0x380a, 0x02},
{0x380b, 0x50}, // Y_OUTPUT_SIZE;
{0x380c, 0x06},
{0x380d, 0xac}, // HTS;
{0x3810, 0x00},
{0x3811, 0x00},
{0x3812, 0x00},
{0x3813, 0x00},
{0x3814, 0x31},
{0x3815, 0x31},
{0x4008, 0x00},
{0x4009, 0x03},
{0x5708, 0x01},
{0x5704, 0x02},
{0x5705, 0xd0}, // X_WIN;
{0x5706, 0x02},
{0x5707, 0x50}, // Y_WIN;
{0x3820, 0xc2}, // FLIP_FORMAT;
{0x3821, 0x01}, // MIRROR_FORMAT;
{0x5090, 0x00}, // PRE ISP CTRL16, default value is 0x0C;
// BIT[3]: Mirror order, BG or GB;
// BIT[2]: Flip order, BR or RB;
{0x5081, 0x41},
{}
};
/*
* 800x600 30fps VBlanking 1lane 10Bit (binning)
*/
static struct ov2680_reg const ov2680_800x600_30fps[] = {
{0x3086, 0x01},
{0x370a, 0x23},
{0x3801, 0x00}, /* hstart 0 */
{0x3802, 0x00},
{0x3803, 0x00}, /* vstart 0 */
{0x3804, 0x06},
{0x3805, 0x4f}, /* hend 1615 */
{0x3806, 0x04},
{0x3807, 0xbf}, /* vend 1215 */
{0x3808, 0x03},
{0x3809, 0x20}, /* hsize 800 */
{0x380a, 0x02},
{0x380b, 0x58}, /* vsize 600 */
{0x380c, 0x06},
{0x380d, 0xac}, /* htotal 1708 */
{0x3810, 0x00},
{0x3811, 0x00},
{0x3812, 0x00},
{0x3813, 0x00},
{0x3814, 0x31},
{0x3815, 0x31},
{0x5708, 0x01},
{0x5704, 0x03},
{0x5705, 0x20},
{0x5706, 0x02},
{0x5707, 0x58},
{0x3820, 0xc2},
{0x3821, 0x01},
{0x5090, 0x00},
{0x4008, 0x00},
{0x4009, 0x03},
{0x5081, 0x41},
{}
};
/*
* 720p=1280*720 30fps VBlanking 1lane 10Bit (no-Scaling)
*/
static struct ov2680_reg const ov2680_720p_30fps[] = {
{0x3086, 0x00},
{0x370a, 0x21},
{0x3801, 0xa0}, /* hstart 160 */
{0x3802, 0x00},
{0x3803, 0xf2}, /* vstart 242 */
{0x3804, 0x05},
{0x3805, 0xbf}, /* hend 1471 */
{0x3806, 0x03},
{0x3807, 0xdd}, /* vend 989 */
{0x3808, 0x05},
{0x3809, 0x10}, /* hsize 1296 */
{0x380a, 0x02},
{0x380b, 0xe0}, /* vsize 736 */
{0x380c, 0x06},
{0x380d, 0xa8}, /* htotal 1704 */
{0x3810, 0x00},
{0x3811, 0x08},
{0x3812, 0x00},
{0x3813, 0x06},
{0x3814, 0x11},
{0x3815, 0x11},
{0x4008, 0x02},
{0x4009, 0x09},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x05},
{0x5705, 0x10},
{0x5706, 0x02},
{0x5707, 0xe0},
{0x3820, 0xc0},
{0x3821, 0x00},
// {0x5090, 0x0c},
{}
};
/*
* 1296x976 30fps VBlanking 1lane 10Bit(no-scaling)
*/
static struct ov2680_reg const ov2680_1296x976_30fps[] = {
{0x3086, 0x00},
{0x370a, 0x21},
{0x3801, 0xa0}, /* hstart 160 */
{0x3802, 0x00},
{0x3803, 0x78}, /* vstart 120 */
{0x3804, 0x05},
{0x3805, 0xbf}, /* hend 1471 */
{0x3806, 0x04},
{0x3807, 0x57}, /* vend 1111 */
{0x3808, 0x05},
{0x3809, 0x10}, /* hsize 1296 */
{0x380a, 0x03},
{0x380b, 0xd0}, /* vsize 976 */
{0x380c, 0x06},
{0x380d, 0xa8}, /* htotal 1704 */
{0x3810, 0x00},
{0x3811, 0x08},
{0x3812, 0x00},
{0x3813, 0x08},
{0x3814, 0x11},
{0x3815, 0x11},
{0x4008, 0x02},
{0x4009, 0x09},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x05},
{0x5705, 0x10},
{0x5706, 0x03},
{0x5707, 0xd0},
{0x3820, 0xc0},
{0x3821, 0x00}, //mirror/flip
// {0x5090, 0x0c},
{}
};
/*
* 1456*1096 30fps VBlanking 1lane 10bit(no-scaling)
*/
static struct ov2680_reg const ov2680_1456x1096_30fps[] = {
{0x3086, 0x00},
{0x370a, 0x21},
{0x3801, 0x90},
{0x3802, 0x00},
{0x3803, 0x78},
{0x3804, 0x06},
{0x3805, 0x4f},
{0x3806, 0x04},
{0x3807, 0xC0},
{0x3808, 0x05},
{0x3809, 0xb0},
{0x380a, 0x04},
{0x380b, 0x48},
{0x380c, 0x06},
{0x380d, 0xa8},
{0x3810, 0x00},
{0x3811, 0x08},
{0x3812, 0x00},
{0x3813, 0x00},
{0x3814, 0x11},
{0x3815, 0x11},
{0x4008, 0x02},
{0x4009, 0x09},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x05},
{0x5705, 0xb0},
{0x5706, 0x04},
{0x5707, 0x48},
{0x3820, 0xc0},
{0x3821, 0x00},
// {0x5090, 0x0c},
{}
};
/*
*1616x916 30fps VBlanking 1lane 10bit
*/
static struct ov2680_reg const ov2680_1616x916_30fps[] = {
{0x3086, 0x00},
{0x370a, 0x21},
{0x3801, 0x00},
{0x3802, 0x00},
{0x3803, 0x96},
{0x3804, 0x06},
{0x3805, 0x4f},
{0x3806, 0x04},
{0x3807, 0x39},
{0x3808, 0x06},
{0x3809, 0x50},
{0x380a, 0x03},
{0x380b, 0x94},
{0x380c, 0x06},
{0x380d, 0xa8},
{0x3810, 0x00},
{0x3811, 0x00},
{0x3812, 0x00},
{0x3813, 0x08},
{0x3814, 0x11},
{0x3815, 0x11},
{0x4008, 0x02},
{0x4009, 0x09},
{0x5081, 0x41},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x06},
{0x5705, 0x50},
{0x5706, 0x03},
{0x5707, 0x94},
{0x3820, 0xc0},
{0x3821, 0x00},
// {0x5090, 0x0C},
{}
};
/*
* 1616x1082 30fps VBlanking 1lane 10Bit
*/
static struct ov2680_reg const ov2680_1616x1082_30fps[] = {
{0x3086, 0x00},
{0x370a, 0x21},
{0x3801, 0x00},
{0x3802, 0x00},
{0x3803, 0x86},
{0x3804, 0x06},
{0x3805, 0x4f},
{0x3806, 0x04},
{0x3807, 0xbf},
{0x3808, 0x06},
{0x3809, 0x50},
{0x380a, 0x04},
{0x380b, 0x3a},
{0x380c, 0x06},
{0x380d, 0xa8},
{0x3810, 0x00},
{0x3811, 0x00},
{0x3812, 0x00},
{0x3813, 0x00},
{0x3814, 0x11},
{0x3815, 0x11},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x06},
{0x5705, 0x50},
{0x5706, 0x04},
{0x5707, 0x3a},
{0x3820, 0xc0},
{0x3821, 0x00},
// {0x5090, 0x0C},
{0x4008, 0x02},
{0x4009, 0x09},
{0x5081, 0x41},
{}
};
/*
* 1616x1216 30fps VBlanking 1lane 10Bit
*/
static struct ov2680_reg const ov2680_1616x1216_30fps[] = {
{0x3086, 0x00},
{0x370a, 0x21},
{0x3801, 0x00},
{0x3802, 0x00},
{0x3803, 0x00},
{0x3804, 0x06},
{0x3805, 0x4f},
{0x3806, 0x04},
{0x3807, 0xbf},
{0x3808, 0x06},
{0x3809, 0x50},//50},//4line for mirror and flip
{0x380a, 0x04},
{0x380b, 0xc0},//c0},
{0x380c, 0x06},
{0x380d, 0xa8},
{0x3810, 0x00},
{0x3811, 0x00},
{0x3812, 0x00},
{0x3813, 0x00},
{0x3814, 0x11},
{0x3815, 0x11},
{0x4008, 0x00},
{0x4009, 0x0b},
{0x5081, 0x01},
{0x5708, 0x01}, //add for full size flip off and mirror off 2014/09/11
{0x5704, 0x06},
{0x5705, 0x50},
{0x5706, 0x04},
{0x5707, 0xc0},
{0x3820, 0xc0},
{0x3821, 0x00},
// {0x5090, 0x0C},
{}
};
static struct ov2680_resolution ov2680_res_preview[] = {
{
.width = 1616,
.height = 1216,
.pix_clk_freq = 66,
.fps = 30,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_1616x1216_30fps,
},
{
.width = 1616,
.height = 1082,
.pix_clk_freq = 66,
.fps = 30,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_1616x1082_30fps,
},
{
.width = 1616,
.height = 916,
.fps = 30,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_1616x916_30fps,
},
{
.width = 1456,
.height = 1096,
.fps = 30,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_1456x1096_30fps,
},
{
.width = 1296,
.height = 976,
.fps = 30,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_1296x976_30fps,
},
{
.width = 1296,
.height = 736,
.fps = 60,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_720p_30fps,
},
{
.width = 800,
.height = 600,
.fps = 60,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_800x600_30fps,
},
{
.width = 720,
.height = 592,
.fps = 60,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_720x592_30fps,
},
{
.width = 656,
.height = 496,
.fps = 60,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_656x496_30fps,
},
{
.width = 336,
.height = 256,
.fps = 60,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_QVGA_30fps,
},
{
.width = 352,
.height = 288,
.fps = 60,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_CIF_30fps,
},
{
.width = 176,
.height = 144,
.fps = 60,
.pix_clk_freq = 66,
.pixels_per_line = 1698,//1704,
.lines_per_frame = 1294,
.skip_frames = 3,
.regs = ov2680_QCIF_30fps,
},
};
#define N_RES_PREVIEW (ARRAY_SIZE(ov2680_res_preview))
#endif #endif
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7