mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 02:32:09 -04:00
V4L/DVB (12506): soc-camera: convert to platform device
Convert soc-camera core and all drivers to platform device API. We already converted platforms to register a platform device for each soc-camera client, now we remove the compatibility code and switch completely to the new scheme. This is a preparatory step for the v4l2-subdev conversion. Signed-off-by: Guennadi Liakhovetski <[email protected]> Signed-off-by: Mauro Carvalho Chehab <[email protected]>
This commit is contained in:
parent
bc1937b41d
commit
40e2e09270
13 changed files with 699 additions and 677 deletions
|
|
@ -20,7 +20,6 @@
|
|||
struct soc_camera_device {
|
||||
struct list_head list;
|
||||
struct device dev;
|
||||
struct device *control;
|
||||
unsigned short width; /* Current window */
|
||||
unsigned short height; /* sizes */
|
||||
unsigned short x_min; /* Camera capabilities */
|
||||
|
|
@ -131,17 +130,25 @@ static inline struct soc_camera_host *to_soc_camera_host(struct device *dev)
|
|||
return dev_get_drvdata(dev);
|
||||
}
|
||||
|
||||
extern int soc_camera_host_register(struct soc_camera_host *ici);
|
||||
extern void soc_camera_host_unregister(struct soc_camera_host *ici);
|
||||
extern int soc_camera_device_register(struct soc_camera_device *icd);
|
||||
extern void soc_camera_device_unregister(struct soc_camera_device *icd);
|
||||
static inline struct soc_camera_link *to_soc_camera_link(struct soc_camera_device *icd)
|
||||
{
|
||||
return icd->dev.platform_data;
|
||||
}
|
||||
|
||||
extern int soc_camera_video_start(struct soc_camera_device *icd);
|
||||
extern void soc_camera_video_stop(struct soc_camera_device *icd);
|
||||
static inline struct device *to_soc_camera_control(struct soc_camera_device *icd)
|
||||
{
|
||||
return dev_get_drvdata(&icd->dev);
|
||||
}
|
||||
|
||||
extern const struct soc_camera_data_format *soc_camera_format_by_fourcc(
|
||||
int soc_camera_host_register(struct soc_camera_host *ici);
|
||||
void soc_camera_host_unregister(struct soc_camera_host *ici);
|
||||
|
||||
int soc_camera_video_start(struct soc_camera_device *icd, struct device *dev);
|
||||
void soc_camera_video_stop(struct soc_camera_device *icd);
|
||||
|
||||
const struct soc_camera_data_format *soc_camera_format_by_fourcc(
|
||||
struct soc_camera_device *icd, unsigned int fourcc);
|
||||
extern const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
|
||||
const struct soc_camera_format_xlate *soc_camera_xlate_by_fourcc(
|
||||
struct soc_camera_device *icd, unsigned int fourcc);
|
||||
|
||||
struct soc_camera_data_format {
|
||||
|
|
@ -170,8 +177,6 @@ struct soc_camera_format_xlate {
|
|||
|
||||
struct soc_camera_ops {
|
||||
struct module *owner;
|
||||
int (*probe)(struct soc_camera_device *);
|
||||
void (*remove)(struct soc_camera_device *);
|
||||
int (*suspend)(struct soc_camera_device *, pm_message_t state);
|
||||
int (*resume)(struct soc_camera_device *);
|
||||
int (*init)(struct soc_camera_device *);
|
||||
|
|
|
|||
|
|
@ -18,11 +18,10 @@ struct device;
|
|||
|
||||
struct soc_camera_platform_info {
|
||||
int iface;
|
||||
char *format_name;
|
||||
const char *format_name;
|
||||
unsigned long format_depth;
|
||||
struct v4l2_pix_format format;
|
||||
unsigned long bus_param;
|
||||
void (*power)(int);
|
||||
struct device *dev;
|
||||
int (*set_capture)(struct soc_camera_platform_info *info, int enable);
|
||||
struct soc_camera_link link;
|
||||
|
|
|
|||
Loading…
Reference in a new issue