mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-23 12:43:55 +08:00
[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:
parent
bff782d78a
commit
2d40cb3f0d
@ -1475,7 +1475,10 @@ static __init int vpif_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
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++) {
|
||||
subdevdata = &vpif_obj.config->subdev_info[i];
|
||||
vpif_obj.sd[i] =
|
||||
|
@ -78,6 +78,7 @@ struct vpif_capture_config {
|
||||
struct vpif_capture_chan_config chan_config[VPIF_CAPTURE_MAX_CHANNELS];
|
||||
struct vpif_subdev_info *subdev_info;
|
||||
int subdev_count;
|
||||
int i2c_adapter_id;
|
||||
const char *card_name;
|
||||
struct v4l2_async_subdev **asd; /* Flat array, arranged in groups */
|
||||
int *asd_sizes; /* 0-terminated array of asd group sizes */
|
||||
|
Loading…
Reference in New Issue
Block a user