[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>

diff --git a/drivers/media/platform/davinci/vpif_capture.c b/drivers/media/platform/davinci/vpif_capture.c
index d489f047a6fa633e1058802fd72506cc02063ffb..54c439705b20cca59aca8b8fae8e40babed995af 100644 (file)
--- a/drivers/media/platform/davinci/vpif_capture.c
+++ b/drivers/media/platform/davinci/vpif_capture.c
@@ -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] =

diff --git a/include/media/davinci/vpif_types.h b/include/media/davinci/vpif_types.h
index 11b0516b48c23dfb1ca2da1f940d8fd241a8c117..c49c306cba6177fc21e5f9765059a98935bddc9a 100644 (file)
--- a/include/media/davinci/vpif_types.h
+++ b/include/media/davinci/vpif_types.h
@@ -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 */