On 02/24/2015 04:25 PM, Russell King - ARM Linux wrote:
> On Tue, Feb 24, 2015 at 04:21:21PM +0200, Peter Ujfalusi wrote:
>> Use the dma-requests property from DT to get the number of DMA requests.
>> In case of legacy boot or failure to find the property, use the default
>> 127 as number of requests.
>>
>> Signed-off-by: Peter Ujfalusi <peter.ujfal...@ti.com>
>> ---
>> drivers/dma/omap-dma.c | 11 ++++++++++-
>> 1 file changed, 10 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/dma/omap-dma.c b/drivers/dma/omap-dma.c
>> index 56c33e93dd24..7def31c919f4 100644
>> --- a/drivers/dma/omap-dma.c
>> +++ b/drivers/dma/omap-dma.c
>> @@ -34,6 +34,7 @@ struct omap_dmadev {
>> const struct omap_dma_reg *reg_map;
>> struct omap_system_dma_plat_info *plat;
>> bool legacy;
>> + unsigned dma_requests;
>> spinlock_t irq_lock;
>> uint32_t irq_enable_mask;
>> struct omap_chan *lch_map[OMAP_SDMA_CHANNELS];
>> @@ -1118,7 +1119,15 @@ static int omap_dma_probe(struct platform_device
>> *pdev)
>>
>> tasklet_init(&od->task, omap_dma_sched, (unsigned long)od);
>>
>> - for (i = 0; i < OMAP_SDMA_REQUESTS; i++) {
>> + if (!pdev->dev.of_node || of_property_read_u32(pdev->dev.of_node,
>> + "dma-requests",
>> + &od->dma_requests)) {
>> + dev_info(&pdev->dev,
>> + "DMA request lines not specified, using 127\n");
>> + od->dma_requests = 127;
>
> What happened to OMAP_SDMA_REQUESTS?
>
> If you're not going to use OMAP_SDMA_REQUESTS, then don't add it. If
> you are going to use it, please also change the dev_info() line to use
> that macro too.
Aargh, yes you are right. Will fix this up in v2.
--
Péter
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
