summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacek Anaszewski <j.anaszewski@samsung.com>2014-10-23 12:49:42 (GMT)
committerChanho Park <chanho61.park@samsung.com>2014-11-18 03:01:17 (GMT)
commitb77fbe65840d990f6a6bd1196923c03802bbf8be (patch)
tree96400d8b6e0e62e9a1c22cbc70797575018f1e0b
parent0e4e9780c84bcef78e64a2c8b6561bf66db7ade4 (diff)
downloadlinux-3.10-b77fbe65840d990f6a6bd1196923c03802bbf8be.zip
linux-3.10-b77fbe65840d990f6a6bd1196923c03802bbf8be.tar.gz
linux-3.10-b77fbe65840d990f6a6bd1196923c03802bbf8be.tar.bz2
[media] s5p-mfc: Adjust memports handling to MFC v7 needs.
MFC v7 supports only one memory interface. Adjust memory ports initialization accordingly. Change-Id: I56e2c582c41f9ad948dc612b3060688619195b1c Signed-off-by: Jacek Anaszewski <j.anaszewski@samsung.com>
-rw-r--r--drivers/media/platform/s5p-mfc/s5p_mfc.c14
1 files changed, 9 insertions, 5 deletions
diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index face9d1..e27011b 100644
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1089,12 +1089,16 @@ static int s5p_mfc_probe(struct platform_device *pdev)
goto err_res;
}
- dev->mem_dev_r = device_find_child(&dev->plat_dev->dev,
+ if (IS_MFCV7(dev)) {
+ dev->mem_dev_r = dev->mem_dev_l;
+ } else {
+ dev->mem_dev_r = device_find_child(&dev->plat_dev->dev,
(void *)MFC_PORT_R, match_child);
- if (!dev->mem_dev_r) {
- mfc_err("Mem child (R) device get failed\n");
- ret = -ENODEV;
- goto err_res;
+ if (!dev->mem_dev_r) {
+ mfc_err("Mem child (R) device get failed\n");
+ ret = -ENODEV;
+ goto err_res;
+ }
}
dev->alloc_ctx[0] = vb2_dma_contig_init_ctx(dev->mem_dev_l);