Commit 04da0010 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

media: atomisp-ov2680: remove some unused fields

The sensor resolution arrays have two unused fields. Drop them.
Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 8734c1d9
...@@ -141,7 +141,6 @@ struct regval_list { ...@@ -141,7 +141,6 @@ struct regval_list {
}; };
struct ov2680_resolution { struct ov2680_resolution {
u8 *desc;
const struct ov2680_reg *regs; const struct ov2680_reg *regs;
int res; int res;
int width; int width;
...@@ -154,7 +153,6 @@ struct ov2680_resolution { ...@@ -154,7 +153,6 @@ struct ov2680_resolution {
u8 bin_factor_x; u8 bin_factor_x;
u8 bin_factor_y; u8 bin_factor_y;
u8 bin_mode; u8 bin_mode;
bool used;
}; };
struct ov2680_format { struct ov2680_format {
...@@ -757,12 +755,10 @@ static struct ov2680_reg const ov2680_1616x1216_30fps[] = { ...@@ -757,12 +755,10 @@ static struct ov2680_reg const ov2680_1616x1216_30fps[] = {
static struct ov2680_resolution ov2680_res_preview[] = { static struct ov2680_resolution ov2680_res_preview[] = {
{ {
.desc = "ov2680_1616x1216_30fps",
.width = 1616, .width = 1616,
.height = 1216, .height = 1216,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.fps = 30, .fps = 30,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -772,12 +768,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -772,12 +768,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_1616x1216_30fps, .regs = ov2680_1616x1216_30fps,
}, },
{ {
.desc = "ov2680_1616x1082_30fps",
.width = 1616, .width = 1616,
.height = 1082, .height = 1082,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.fps = 30, .fps = 30,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -787,12 +781,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -787,12 +781,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_1616x1082_30fps, .regs = ov2680_1616x1082_30fps,
}, },
{ {
.desc = "ov2680_1616x916_30fps",
.width = 1616, .width = 1616,
.height = 916, .height = 916,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -802,12 +794,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -802,12 +794,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_1616x916_30fps, .regs = ov2680_1616x916_30fps,
}, },
{ {
.desc = "ov2680_1456x1096_30fps",
.width = 1456, .width = 1456,
.height = 1096, .height = 1096,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -817,12 +807,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -817,12 +807,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_1456x1096_30fps, .regs = ov2680_1456x1096_30fps,
}, },
{ {
.desc = "ov2680_1296x976_30fps",
.width = 1296, .width = 1296,
.height = 976, .height = 976,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -832,12 +820,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -832,12 +820,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_1296x976_30fps, .regs = ov2680_1296x976_30fps,
}, },
{ {
.desc = "ov2680_720p_30fps",
.width = 1280, .width = 1280,
.height = 720, .height = 720,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -847,12 +833,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -847,12 +833,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_720p_30fps, .regs = ov2680_720p_30fps,
}, },
{ {
.desc = "ov2680_800x600_30fps",
.width = 800, .width = 800,
.height = 600, .height = 600,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -862,12 +846,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -862,12 +846,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_800x600_30fps, .regs = ov2680_800x600_30fps,
}, },
{ {
.desc = "ov2680_720x592_30fps",
.width = 720, .width = 720,
.height = 592, .height = 592,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -877,12 +859,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -877,12 +859,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_720x592_30fps, .regs = ov2680_720x592_30fps,
}, },
{ {
.desc = "ov2680_656x496_30fps",
.width = 656, .width = 656,
.height = 496, .height = 496,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -892,12 +872,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -892,12 +872,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_656x496_30fps, .regs = ov2680_656x496_30fps,
}, },
{ {
.desc = "ov2680_QVGA_30fps",
.width = 336, .width = 336,
.height = 256, .height = 256,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -907,12 +885,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -907,12 +885,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_QVGA_30fps, .regs = ov2680_QVGA_30fps,
}, },
{ {
.desc = "ov2680_CIF_30fps",
.width = 352, .width = 352,
.height = 288, .height = 288,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
...@@ -922,12 +898,10 @@ static struct ov2680_resolution ov2680_res_preview[] = { ...@@ -922,12 +898,10 @@ static struct ov2680_resolution ov2680_res_preview[] = {
.regs = ov2680_CIF_30fps, .regs = ov2680_CIF_30fps,
}, },
{ {
.desc = "ov2680_QCIF_30fps",
.width = 176, .width = 176,
.height = 144, .height = 144,
.fps = 30, .fps = 30,
.pix_clk_freq = 66, .pix_clk_freq = 66,
.used = 0,
.pixels_per_line = 1698,//1704, .pixels_per_line = 1698,//1704,
.lines_per_frame = 1294, .lines_per_frame = 1294,
.bin_factor_x = 0, .bin_factor_x = 0,
......
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