diff options
| author | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-10-23 14:49:42 +0200 |
|---|---|---|
| committer | Jacek Anaszewski <j.anaszewski@samsung.com> | 2014-11-05 16:05:43 +0100 |
| commit | 65d3d3f9937df9ff446351c35bbdb5089f5df19e (patch) | |
| tree | 8c710e8d025dd644301ae002b416544545ddca65 | |
| parent | 5bac4b8d7f908b15aedb8853cef422791386cc2a (diff) | |
| download | linux-3.10-65d3d3f9937df9ff446351c35bbdb5089f5df19e.tar.gz linux-3.10-65d3d3f9937df9ff446351c35bbdb5089f5df19e.tar.bz2 linux-3.10-65d3d3f9937df9ff446351c35bbdb5089f5df19e.zip | |
[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.c | 14 |
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 face9d13441..e27011ba882 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); |