diff options
| author | Vinod Koul <vinod.koul@intel.com> | 2013-09-04 18:36:53 +0530 |
|---|---|---|
| committer | Vinod Koul <vinod.koul@intel.com> | 2013-09-04 18:36:53 +0530 |
| commit | bd127639f43ed00f721b403c7c252caa19d0f613 (patch) | |
| tree | fbecc9ae6b7a0b41c061aafff06f1fabd7c1e73b | |
| parent | 265d9c673d47fcd5812d69dc07104b706285de56 (diff) | |
| parent | dbaf6d85114bd2043f3ca758f71f9f7e4e579601 (diff) | |
Merge branch 'topic/api_caps' into for-linus
| -rw-r--r-- | drivers/dma/pl330.c | 15 | ||||
| -rw-r--r-- | include/linux/dmaengine.h | 8 |
2 files changed, 8 insertions, 15 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, caps->cmd_pause = false; caps->cmd_terminate = true; - /* - * This is the limit for transfers with a buswidth of 1, larger - * buswidths will have larger limits. - */ - caps->max_sg_len = 1900800; - caps->max_sg_nr = 0; - return 0; } @@ -3017,6 +3010,14 @@ pl330_probe(struct amba_device *adev, const struct amba_id *id) "unable to register DMA to the generic DT DMA helpers\n"); } } + /* + * This is the limit for transfers with a buswidth of 1, larger + * buswidths will have larger limits. + */ + ret = dma_set_max_seg_size(&adev->dev, 1900800); + if (ret) + dev_err(&adev->dev, "unable to set the seg size\n"); + dev_info(&adev->dev, "Loaded driver for PL330 DMAC-%d\n", adev->periphid); diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index 13ac4f553227..2601186ab183 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -380,11 +380,6 @@ struct dma_slave_config { * should be checked by controller as well * @cmd_pause: true, if pause and thereby resume is supported * @cmd_terminate: true, if terminate cmd is supported - * - * @max_sg_nr: maximum number of SG segments supported - * 0 for no maximum - * @max_sg_len: maximum length of a SG segment supported - * 0 for no maximum */ struct dma_slave_caps { u32 src_addr_widths; @@ -392,9 +387,6 @@ struct dma_slave_caps { u32 directions; bool cmd_pause; bool cmd_terminate; - - u32 max_sg_nr; - u32 max_sg_len; }; static inline const char *dma_chan_name(struct dma_chan *chan) |