Commit ebfa8f5e authored by Hans de Goede's avatar Hans de Goede Committed by Mauro Carvalho Chehab
Browse files

media: atomisp: Remove no longer used binning info from sensor resolution info 



Remove the no longer used bin_factor_x, bin_factor_y and bin_mode members
from the resolution info inside various atomisp camera sensor drivers.

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 159a61da

drivers/staging/media/atomisp/i2c/gc0310.h

+0 −6
Original line number Diff line number Diff line
@@ -123,9 +123,6 @@ struct gc0310_resolution { 
	u32 skip_frames;

	u16 pixels_per_line;

	u16 lines_per_frame;

	u8 bin_factor_x;

	u8 bin_factor_y;

	u8 bin_mode;

	bool used;

};
@@ -386,9 +383,6 @@ static struct gc0310_resolution gc0310_res_preview[] = { 
		.pixels_per_line = 0x0314,

		.lines_per_frame = 0x0213,

#endif

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 2,

		.regs = gc0310_VGA_30fps,

	},

drivers/staging/media/atomisp/i2c/gc2235.h

+0 −27
Original line number Diff line number Diff line
@@ -134,9 +134,6 @@ struct gc2235_resolution { 
	u32 skip_frames;

	u16 pixels_per_line;

	u16 lines_per_frame;

	u8 bin_factor_x;

	u8 bin_factor_y;

	u8 bin_mode;

	bool used;

};
@@ -536,9 +533,6 @@ static struct gc2235_resolution gc2235_res_preview[] = { 
		.used = 0,

		.pixels_per_line = 2132,

		.lines_per_frame = 1068,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_1600_900_30fps,

	},
@@ -552,9 +546,6 @@ static struct gc2235_resolution gc2235_res_preview[] = { 
		.used = 0,

		.pixels_per_line = 2132,

		.lines_per_frame = 1368,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_1616_1082_30fps,

	},
@@ -567,9 +558,6 @@ static struct gc2235_resolution gc2235_res_preview[] = { 
		.used = 0,

		.pixels_per_line = 2132,

		.lines_per_frame = 1368,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_1616_1216_30fps,

	},
@@ -593,9 +581,6 @@ static struct gc2235_resolution gc2235_res_still[] = { 
		.used = 0,

		.pixels_per_line = 2132,

		.lines_per_frame = 1068,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_1600_900_30fps,

	},
@@ -608,9 +593,6 @@ static struct gc2235_resolution gc2235_res_still[] = { 
		.used = 0,

		.pixels_per_line = 2132,

		.lines_per_frame = 1368,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_1616_1082_30fps,

	},
@@ -623,9 +605,6 @@ static struct gc2235_resolution gc2235_res_still[] = { 
		.used = 0,

		.pixels_per_line = 2132,

		.lines_per_frame = 1368,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_1616_1216_30fps,

	},
@@ -644,9 +623,6 @@ static struct gc2235_resolution gc2235_res_video[] = { 
		.used = 0,

		.pixels_per_line = 1828,

		.lines_per_frame = 888,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_1296_736_30fps,

	},
@@ -659,9 +635,6 @@ static struct gc2235_resolution gc2235_res_video[] = { 
		.used = 0,

		.pixels_per_line = 1492,

		.lines_per_frame = 792,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = gc2235_960_640_30fps,

	},

drivers/staging/media/atomisp/i2c/mt9m114.h

+0 −12
Original line number Diff line number Diff line
@@ -316,9 +316,6 @@ struct mt9m114_res_struct { 
	struct regval_list *regs;

	u16 pixels_per_line;

	u16 lines_per_frame;

	u8 bin_factor_x;

	u8 bin_factor_y;

	u8 bin_mode;

};



/* 2 bytes used for address: 256 bytes total */
@@ -350,9 +347,6 @@ static struct mt9m114_res_struct mt9m114_res[] = { 


		.pixels_per_line = 0x0640,

		.lines_per_frame = 0x0307,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

	},

	{

		.desc	= "848P",
@@ -366,9 +360,6 @@ static struct mt9m114_res_struct mt9m114_res[] = { 


		.pixels_per_line = 0x0640,

		.lines_per_frame = 0x03E8,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

	},

	{

		.desc	= "960P",
@@ -382,9 +373,6 @@ static struct mt9m114_res_struct mt9m114_res[] = { 


		.pixels_per_line = 0x0644, /* consistent with regs arrays */

		.lines_per_frame = 0x03E5, /* consistent with regs arrays */

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

	},

};

drivers/staging/media/atomisp/i2c/ov2680.h

+0 −39
Original line number Diff line number Diff line
@@ -147,9 +147,6 @@ struct ov2680_resolution { 
	u32 skip_frames;

	u16 pixels_per_line;

	u16 lines_per_frame;

	u8 bin_factor_x;

	u8 bin_factor_y;

	u8 bin_mode;

};



struct ov2680_format {
@@ -758,9 +755,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.fps = 30,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_1616x1216_30fps,

	},
@@ -771,9 +765,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.fps = 30,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_1616x1082_30fps,

	},
@@ -784,9 +775,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_1616x916_30fps,

	},
@@ -797,9 +785,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_1456x1096_30fps,

	},
@@ -810,9 +795,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_1296x976_30fps,

	},
@@ -823,9 +805,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_720p_30fps,

	},
@@ -836,9 +815,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_800x600_30fps,

	},
@@ -849,9 +825,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_720x592_30fps,

	},
@@ -862,9 +835,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_656x496_30fps,

	},
@@ -875,9 +845,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_QVGA_30fps,

	},
@@ -888,9 +855,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_CIF_30fps,

	},
@@ -901,9 +865,6 @@ static struct ov2680_resolution ov2680_res_preview[] = { 
		.pix_clk_freq = 66,

		.pixels_per_line = 1698,//1704,

		.lines_per_frame = 1294,

		.bin_factor_x = 0,

		.bin_factor_y = 0,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2680_QCIF_30fps,

	},

drivers/staging/media/atomisp/i2c/ov2722.h

+0 −30
Original line number Diff line number Diff line
@@ -177,9 +177,6 @@ struct ov2722_resolution { 
	u32 skip_frames;

	u16 pixels_per_line;

	u16 lines_per_frame;

	u8 bin_factor_x;

	u8 bin_factor_y;

	u8 bin_mode;

	bool used;

	int mipi_freq;

};
@@ -1109,9 +1106,6 @@ static struct ov2722_resolution ov2722_res_preview[] = { 
		.used = 0,

		.pixels_per_line = 2260,

		.lines_per_frame = 1244,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_1632_1092_30fps,

		.mipi_freq = 422400,
@@ -1125,9 +1119,6 @@ static struct ov2722_resolution ov2722_res_preview[] = { 
		.used = 0,

		.pixels_per_line = 2260,

		.lines_per_frame = 1244,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_1452_1092_30fps,

		.mipi_freq = 422400,
@@ -1141,9 +1132,6 @@ static struct ov2722_resolution ov2722_res_preview[] = { 
		.used = 0,

		.pixels_per_line = 2068,

		.lines_per_frame = 1114,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_1080p_30fps,

		.mipi_freq = 345600,
@@ -1167,9 +1155,6 @@ struct ov2722_resolution ov2722_res_still[] = { 
		.used = 0,

		.pixels_per_line = 2260,

		.lines_per_frame = 1244,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_1632_1092_30fps,

		.mipi_freq = 422400,
@@ -1183,9 +1168,6 @@ struct ov2722_resolution ov2722_res_still[] = { 
		.used = 0,

		.pixels_per_line = 2260,

		.lines_per_frame = 1244,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_1452_1092_30fps,

		.mipi_freq = 422400,
@@ -1199,9 +1181,6 @@ struct ov2722_resolution ov2722_res_still[] = { 
		.used = 0,

		.pixels_per_line = 2068,

		.lines_per_frame = 1114,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_1080p_30fps,

		.mipi_freq = 345600,
@@ -1220,9 +1199,6 @@ struct ov2722_resolution ov2722_res_video[] = { 
		.used = 0,

		.pixels_per_line = 2048,

		.lines_per_frame = 1184,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_QVGA_30fps,

		.mipi_freq = 364800,
@@ -1236,9 +1212,6 @@ struct ov2722_resolution ov2722_res_video[] = { 
		.used = 0,

		.pixels_per_line = 2048,

		.lines_per_frame = 1184,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_480P_30fps,

	},
@@ -1251,9 +1224,6 @@ struct ov2722_resolution ov2722_res_video[] = { 
		.used = 0,

		.pixels_per_line = 2068,

		.lines_per_frame = 1114,

		.bin_factor_x = 1,

		.bin_factor_y = 1,

		.bin_mode = 0,

		.skip_frames = 3,

		.regs = ov2722_1080p_30fps,

		.mipi_freq = 345600,