From fac43578dd59953382a1d6fe0a120398cbf524f4 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Wed, 6 Jun 2012 10:55:26 +0530 Subject: [PATCH] --- yaml --- r: 316628 b: refs/heads/master c: 4fd1e324b7b5f80bd521b58593ada74ef89e80c4 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/linux/dmaengine.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 9a18cc8092c2..43f5feafdd35 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f5c55847f7ae31275c3305c997330e5fefa9fa0e +refs/heads/master: 4fd1e324b7b5f80bd521b58593ada74ef89e80c4 diff --git a/trunk/include/linux/dmaengine.h b/trunk/include/linux/dmaengine.h index 56377df39124..ccec62f8e501 100644 --- a/trunk/include/linux/dmaengine.h +++ b/trunk/include/linux/dmaengine.h @@ -338,6 +338,9 @@ enum dma_slave_buswidth { * @device_fc: Flow Controller Settings. Only valid for slave channels. Fill * with 'true' if peripheral should be flow controller. Direction will be * selected at Runtime. + * @slave_id: Slave requester id. Only valid for slave channels. The dma + * slave peripheral will have unique id as dma requester which need to be + * pass as slave config. * * This struct is passed in as configuration data to a DMA engine * in order to set up a certain channel for DMA transport at runtime. @@ -365,6 +368,7 @@ struct dma_slave_config { u32 src_maxburst; u32 dst_maxburst; bool device_fc; + unsigned int slave_id; }; static inline const char *dma_chan_name(struct dma_chan *chan)