Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d839fe17 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Mauro Carvalho Chehab
Browse files

[media] V4L: soc-camera: remove soc-camera client bus-param operations and supporting code 



soc-camera has been completely ported over to V4L2 subdevice mbus-config
operations, soc-camera client bus-param operations and supporting code
can now be removed.

Signed-off-by: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 5476ea8d

drivers/media/video/soc_camera.c

+0 −34
Original line number Diff line number Diff line
@@ -141,40 +141,6 @@ unsigned long soc_camera_apply_board_flags(struct soc_camera_link *icl, 
}

EXPORT_SYMBOL(soc_camera_apply_board_flags);



/**

 * soc_camera_apply_sensor_flags() - apply platform SOCAM_SENSOR_INVERT_* flags

 * @icl:	camera platform parameters

 * @flags:	flags to be inverted according to platform configuration

 * @return:	resulting flags

 */

unsigned long soc_camera_apply_sensor_flags(struct soc_camera_link *icl,

					    unsigned long flags)

{

	unsigned long f;



	/* If only one of the two polarities is supported, switch to the opposite */

	if (icl->flags & SOCAM_SENSOR_INVERT_HSYNC) {

		f = flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW);

		if (f == SOCAM_HSYNC_ACTIVE_HIGH || f == SOCAM_HSYNC_ACTIVE_LOW)

			flags ^= SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW;

	}



	if (icl->flags & SOCAM_SENSOR_INVERT_VSYNC) {

		f = flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW);

		if (f == SOCAM_VSYNC_ACTIVE_HIGH || f == SOCAM_VSYNC_ACTIVE_LOW)

			flags ^= SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW;

	}



	if (icl->flags & SOCAM_SENSOR_INVERT_PCLK) {

		f = flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING);

		if (f == SOCAM_PCLK_SAMPLE_RISING || f == SOCAM_PCLK_SAMPLE_FALLING)

			flags ^= SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING;

	}



	return flags;

}

EXPORT_SYMBOL(soc_camera_apply_sensor_flags);



#define pixfmtstr(x) (x) & 0xff, ((x) >> 8) & 0xff, ((x) >> 16) & 0xff, \

	((x) >> 24) & 0xff

include/media/soc_camera.h

+8 −44
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#ifndef SOC_CAMERA_H

#define SOC_CAMERA_H



#include <linux/bitops.h>

#include <linux/device.h>

#include <linux/mutex.h>

#include <linux/pm.h>
@@ -194,8 +195,6 @@ struct soc_camera_format_xlate { 
};



struct soc_camera_ops {

	unsigned long (*query_bus_param)(struct soc_camera_device *);

	int (*set_bus_param)(struct soc_camera_device *, unsigned long);

	const struct v4l2_queryctrl *controls;

	int num_controls;

};
@@ -238,53 +237,18 @@ static inline struct v4l2_queryctrl const *soc_camera_find_qctrl( 
	return NULL;

}



#define SOCAM_MASTER			(1 << 0)

#define SOCAM_SLAVE			(1 << 1)

#define SOCAM_HSYNC_ACTIVE_HIGH		(1 << 2)

#define SOCAM_HSYNC_ACTIVE_LOW		(1 << 6)

#define SOCAM_VSYNC_ACTIVE_HIGH		(1 << 4)

#define SOCAM_VSYNC_ACTIVE_LOW		(1 << 5)

#define SOCAM_DATAWIDTH_4		(1 << 3)

#define SOCAM_DATAWIDTH_8		(1 << 7)

#define SOCAM_DATAWIDTH_9		(1 << 8)

#define SOCAM_DATAWIDTH_10		(1 << 9)

#define SOCAM_DATAWIDTH_15		(1 << 14)

#define SOCAM_DATAWIDTH_16		(1 << 15)

#define SOCAM_PCLK_SAMPLE_RISING	(1 << 12)

#define SOCAM_PCLK_SAMPLE_FALLING	(1 << 13)

#define SOCAM_DATA_ACTIVE_HIGH		(1 << 10)

#define SOCAM_DATA_ACTIVE_LOW		(1 << 11)

#define SOCAM_MIPI_1LANE		(1 << 16)

#define SOCAM_MIPI_2LANE		(1 << 17)

#define SOCAM_MIPI_3LANE		(1 << 18)

#define SOCAM_MIPI_4LANE		(1 << 19)

#define SOCAM_MIPI	(SOCAM_MIPI_1LANE | SOCAM_MIPI_2LANE | \

			SOCAM_MIPI_3LANE | SOCAM_MIPI_4LANE)

#define SOCAM_DATAWIDTH(x)	BIT((x) - 1)

#define SOCAM_DATAWIDTH_4	SOCAM_DATAWIDTH(4)

#define SOCAM_DATAWIDTH_8	SOCAM_DATAWIDTH(8)

#define SOCAM_DATAWIDTH_9	SOCAM_DATAWIDTH(9)

#define SOCAM_DATAWIDTH_10	SOCAM_DATAWIDTH(10)

#define SOCAM_DATAWIDTH_15	SOCAM_DATAWIDTH(15)

#define SOCAM_DATAWIDTH_16	SOCAM_DATAWIDTH(16)



#define SOCAM_DATAWIDTH_MASK (SOCAM_DATAWIDTH_4 | SOCAM_DATAWIDTH_8 | \

			      SOCAM_DATAWIDTH_9 | SOCAM_DATAWIDTH_10 | \

			      SOCAM_DATAWIDTH_15 | SOCAM_DATAWIDTH_16)



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;



	hsync = common_flags & (SOCAM_HSYNC_ACTIVE_HIGH | SOCAM_HSYNC_ACTIVE_LOW);

	vsync = common_flags & (SOCAM_VSYNC_ACTIVE_HIGH | SOCAM_VSYNC_ACTIVE_LOW);

	pclk = common_flags & (SOCAM_PCLK_SAMPLE_RISING | SOCAM_PCLK_SAMPLE_FALLING);

	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) && !mipi) ? 0 :

		common_flags;

}



static inline void soc_camera_limit_side(int *start, int *length,

		unsigned int start_min,

		unsigned int length_min, unsigned int length_max)