Re: [PATCH] dma: omap-dma: Implement device_slave_caps callback

[Peter Ujfalusi]

Hi Tony,

On 03/12/2014 07:37 PM, Tony Lindgren wrote:
> * Peter Ujfalusi <peter.ujfalusi@xxxxxx> [140307 05:39]:
>> With the callback implemented omap-dma can provide information to client
>> drivers regarding to supported address widths, directions, residue
>> granularity, etc.
> 
> This may need some testing against linux next with Russell's
> omap-dma.c clean-up series merged there. Peter, care to check
> if this patch is still valid against linux next?

The patch applies cleanly on top of linux-next fetched yesterday and I see
Russell's patches underneath.

-- 
Péter

> 
> Regards,
> 
> Tony
>  
>> Signed-off-by: Peter Ujfalusi <peter.ujfalusi@xxxxxx>
>> ---
>>  drivers/dma/omap-dma.c | 18 ++++++++++++++++++
>>  1 file changed, 18 insertions(+)
>>
>> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
>> index 64ceca2920b8..b19f04f4390b 100644
>> --- a/drivers/dma/omap-dma.c
>> +++ b/drivers/dma/omap-dma.c
>> @@ -1088,6 +1088,23 @@ static void omap_dma_free(struct omap_dmadev *od)
>>  	}
>>  }
>>  
>> +#define OMAP_DMA_BUSWIDTHS	(BIT(DMA_SLAVE_BUSWIDTH_1_BYTE) | \
>> +				 BIT(DMA_SLAVE_BUSWIDTH_2_BYTES) | \
>> +				 BIT(DMA_SLAVE_BUSWIDTH_4_BYTES))
>> +
>> +static int omap_dma_device_slave_caps(struct dma_chan *dchan,
>> +				      struct dma_slave_caps *caps)
>> +{
>> +	caps->src_addr_widths = OMAP_DMA_BUSWIDTHS;
>> +	caps->dstn_addr_widths = OMAP_DMA_BUSWIDTHS;
>> +	caps->directions = BIT(DMA_DEV_TO_MEM) | BIT(DMA_MEM_TO_DEV);
>> +	caps->cmd_pause = true;
>> +	caps->cmd_terminate = true;
>> +	caps->residue_granularity = DMA_RESIDUE_GRANULARITY_BURST;
>> +
>> +	return 0;
>> +}
>> +
>>  static int omap_dma_probe(struct platform_device *pdev)
>>  {
>>  	struct omap_dmadev *od;
>> @@ -1118,6 +1135,7 @@ static int omap_dma_probe(struct platform_device *pdev)
>>  	od->ddev.device_prep_slave_sg = omap_dma_prep_slave_sg;
>>  	od->ddev.device_prep_dma_cyclic = omap_dma_prep_dma_cyclic;
>>  	od->ddev.device_control = omap_dma_control;
>> +	od->ddev.device_slave_caps = omap_dma_device_slave_caps;
>>  	od->ddev.dev = &pdev->dev;
>>  	INIT_LIST_HEAD(&od->ddev.channels);
>>  	INIT_LIST_HEAD(&od->pending);
>> -- 
>> 1.9.0
>>

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/