Commit ee1b6f4b authored by Kassey Li's avatar Kassey Li Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: soc-camera: add MIPI bus flags 



Signed-off-by: default avatarKassey Lee <ygli@marvell.com>
Signed-off-by: default avatarQing Xu <qingx@marvell.com>
Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 64149deb

include/media/soc_camera.h

+9 −1
Original line number Diff line number Diff line
@@ -109,6 +109,12 @@ struct soc_camera_host_ops { 
#define SOCAM_SENSOR_INVERT_HSYNC	(1 << 2)

#define SOCAM_SENSOR_INVERT_VSYNC	(1 << 3)

#define SOCAM_SENSOR_INVERT_DATA	(1 << 4)

#define SOCAM_MIPI_1LANE		(1 << 5)

#define SOCAM_MIPI_2LANE		(1 << 6)

#define SOCAM_MIPI_3LANE		(1 << 7)

#define SOCAM_MIPI_4LANE		(1 << 8)

#define SOCAM_MIPI	(SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \

			SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE)



struct i2c_board_info;

struct regulator_bulk_data;
@@ -273,6 +279,7 @@ static inline unsigned long soc_camera_bus_param_compatible( 
			unsigned long camera_flags, unsigned long bus_flags)

{

	unsigned long common_flags, hsync, vsync, pclk, data, buswidth, mode;

	unsigned long mipi;



	common_flags = camera_flags & bus_flags;
@@ -282,8 +289,9 @@ static inline unsigned long soc_camera_bus_param_compatible( 
	data = common_flags & (SOCAM_DATA_ACTIVE_HIGH | SOCAM_DATA_ACTIVE_LOW);

	mode = common_flags & (SOCAM_MASTER | SOCAM_SLAVE);

	buswidth = common_flags & SOCAM_DATAWIDTH_MASK;

	mipi = common_flags & SOCAM_MIPI;



	return (!hsync || !vsync || !pclk || !data || !mode || !buswidth) ? 0 :

	return ((!hsync || !vsync || !pclk || !data || !mode || !buswidth) && !mipi) ? 0 :

		common_flags;

}