Some sensors can have more than one pad (case of S5C73M3).
In such cases FIMC assumes the last pad of the sensor is the source pad.

Signed-off-by: Andrzej Hajda <a.ha...@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.p...@samsung.com>
---
 drivers/media/platform/s5p-fimc/fimc-capture.c |    6 ++++--
 drivers/media/platform/s5p-fimc/fimc-mdevice.c |    3 ++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/media/platform/s5p-fimc/fimc-capture.c 
b/drivers/media/platform/s5p-fimc/fimc-capture.c
index 3d39d97..3acbea3 100644
--- a/drivers/media/platform/s5p-fimc/fimc-capture.c
+++ b/drivers/media/platform/s5p-fimc/fimc-capture.c
@@ -885,14 +885,16 @@ static int fimc_get_sensor_frame_desc(struct v4l2_subdev 
*sensor,
 {
        struct v4l2_mbus_frame_desc fd;
        int i, ret;
+       int pad;
 
        for (i = 0; i < num_planes; i++)
                fd.entry[i].length = plane_fmt[i].sizeimage;
 
+       pad = sensor->entity.num_pads - 1;
        if (try)
-               ret = v4l2_subdev_call(sensor, pad, set_frame_desc, 0, &fd);
+               ret = v4l2_subdev_call(sensor, pad, set_frame_desc, pad, &fd);
        else
-               ret = v4l2_subdev_call(sensor, pad, get_frame_desc, 0, &fd);
+               ret = v4l2_subdev_call(sensor, pad, get_frame_desc, pad, &fd);
 
        if (ret < 0)
                return ret;
diff --git a/drivers/media/platform/s5p-fimc/fimc-mdevice.c 
b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
index a69f053..0a6d23c 100644
--- a/drivers/media/platform/s5p-fimc/fimc-mdevice.c
+++ b/drivers/media/platform/s5p-fimc/fimc-mdevice.c
@@ -660,7 +660,8 @@ static int fimc_md_create_links(struct fimc_md *fmd)
                                 "but s5p-csis module is not loaded!\n"))
                                return -EINVAL;
 
-                       ret = media_entity_create_link(&sensor->entity, 0,
+                       pad = sensor->entity.num_pads - 1;
+                       ret = media_entity_create_link(&sensor->entity, pad,
                                              &csis->entity, CSIS_PAD_SINK,
                                              MEDIA_LNK_FL_IMMUTABLE |
                                              MEDIA_LNK_FL_ENABLED);
-- 
1.7.10.4

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to