aboutsummaryrefslogtreecommitdiff
path: root/drivers/dma/dw_dmac_regs.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-03-31 11:41:47 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-03-31 11:41:47 -0700
commit0bb44280b5ac45e5e911009e66c1d273bea4ccc6 (patch)
tree9b635c657b578e92fb16494bb2f79053f30880ca /drivers/dma/dw_dmac_regs.h
parenta7b436d356d0bdc6156e286f9c251beed1961d2d (diff)
parentbce95c63ef1bcf528ea45c41505eb4c21560d92d (diff)
downloadvexpress-lsk-0bb44280b5ac45e5e911009e66c1d273bea4ccc6.tar.gz
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
Pull slave-dmaengine fixes from Vinod Koul: "Two fixes for slave-dmaengine. The first one is for making slave_id value correct for dw_dmac and the other one fixes the endieness in DT parsing" * 'fixes' of git://git.infradead.org/users/vkoul/slave-dma: dw_dmac: adjust slave_id accordingly to request line base dmaengine: dw_dma: fix endianess for DT xlate function
Diffstat (limited to 'drivers/dma/dw_dmac_regs.h')
-rw-r--r--drivers/dma/dw_dmac_regs.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/dma/dw_dmac_regs.h b/drivers/dma/dw_dmac_regs.h
index cf0ce5c77d6..4d02c3669b7 100644
--- a/drivers/dma/dw_dmac_regs.h
+++ b/drivers/dma/dw_dmac_regs.h
@@ -247,6 +247,7 @@ struct dw_dma {
/* hardware configuration */
unsigned char nr_masters;
unsigned char data_width[4];
+ unsigned int request_line_base;
struct dw_dma_chan chan[0];
};