UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] davinci: vpif_capture: remove hard-coded I2C adapter id 

Remove hard-coded I2C adapter in favor of getting the
ID from platform_data.

Signed-off-by: Kevin Hilman <khilman@baylibre.com>
Acked-by: Sakari Ailus <sakari.ailus@linux.intel.com>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
This commit is contained in:
Kevin Hilman 2016-12-07 16:30:22 -02:00 committed by Mauro Carvalho Chehab
parent bff782d78a
commit 2d40cb3f0d
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/media/platform/davinci/vpif_capture.c
View File

@ -1475,7 +1475,10 @@ static __init int vpif_probe(struct platform_device *pdev)
} }
if (!vpif_obj.config->asd_sizes) { if (!vpif_obj.config->asd_sizes) {
i2c_adap = i2c_get_adapter(1); int i2c_id = vpif_obj.config->i2c_adapter_id;
i2c_adap = i2c_get_adapter(i2c_id);
WARN_ON(!i2c_adap);
for (i = 0; i < subdev_count; i++) { for (i = 0; i < subdev_count; i++) {
subdevdata = &vpif_obj.config->subdev_info[i]; subdevdata = &vpif_obj.config->subdev_info[i];
vpif_obj.sd[i] = vpif_obj.sd[i] =

1
include/media/davinci/vpif_types.h
View File

@ -78,6 +78,7 @@ struct vpif_capture_config {
struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS]; struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];
struct vpif_subdev_info *subdev_info; struct vpif_subdev_info *subdev_info;
int subdev_count; int subdev_count;
int i2c_adapter_id;
const char *card_name; const char *card_name;
struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */ struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
int *asd_sizes; /* 0-terminated array of asd group sizes */ int *asd_sizes; /* 0-terminated array of asd group sizes */