aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/dma/pl330.c
diff options
context:
space:
mode:
authorVinod Koul <vinod.koul@intel.com>2013-09-04 09:06:53 -0400
committerVinod Koul <vinod.koul@intel.com>2013-09-04 09:06:53 -0400
commitbd127639f43ed00f721b403c7c252caa19d0f613 (patch)
treefbecc9ae6b7a0b41c061aafff06f1fabd7c1e73b /drivers/dma/pl330.c
parent265d9c673d47fcd5812d69dc07104b706285de56 (diff)
parentdbaf6d85114bd2043f3ca758f71f9f7e4e579601 (diff)
Merge branch 'topic/api_caps' into for-linus
Diffstat (limited to 'drivers/dma/pl330.c')
-rw-r--r--drivers/dma/pl330.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/dma/pl330.c b/drivers/dma/pl330.c
index 36ed30116ee0..a562d24d20bf 100644
--- a/drivers/dma/pl330.c
+++ b/drivers/dma/pl330.c
@@ -2886,13 +2886,6 @@ static int pl330_dma_device_slave_caps(struct dma_chan *dchan,
2886 caps->cmd_pause = false; 2886 caps->cmd_pause = false;
2887 caps->cmd_terminate = true; 2887 caps->cmd_terminate = true;
2888 2888
2889 /*
2890 * This is the limit for transfers with a buswidth of 1, larger
2891 * buswidths will have larger limits.
2892 */
2893 caps->max_sg_len = 1900800;
2894 caps->max_sg_nr = 0;
2895
2896 return 0; 2889 return 0;
2897} 2890}
2898 2891
@@ -3017,6 +3010,14 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id)
3017 "unable to register DMA to the generic DT DMA helpers\n"); 3010 "unable to register DMA to the generic DT DMA helpers\n");
3018 } 3011 }
3019 } 3012 }
3013 /*
3014 * This is the limit for transfers with a buswidth of 1, larger
3015 * buswidths will have larger limits.
3016 */
3017 ret = dma_set_max_seg_size(&adev->dev, 1900800);
3018 if (ret)
3019 dev_err(&adev->dev, "unable to set the seg size\n");
3020
3020 3021
3021 dev_info(&adev->dev, 3022 dev_info(&adev->dev,
3022 "Loaded driver for PL330 DMAC-%d\n", adev->periphid); 3023 "Loaded driver for PL330 DMAC-%d\n", adev->periphid);