projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'timers-for-linus-migration' of git://git.kernel.org/pub/scm/linux/kerne...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
dma
/
dw_dmac_regs.h
diff --git
a/drivers/dma/dw_dmac_regs.h
b/drivers/dma/dw_dmac_regs.h
index b252b202c5cf1888f65149d3e22deee3d9cfeef0..13a580767031a3aac04046ffd563ef1d83f053b0 100644
(file)
--- a/
drivers/dma/dw_dmac_regs.h
+++ b/
drivers/dma/dw_dmac_regs.h
@@
-126,6
+126,10
@@
struct dw_dma_regs {
#define DW_REGLEN 0x400
#define DW_REGLEN 0x400
+enum dw_dmac_flags {
+ DW_DMA_IS_CYCLIC = 0,
+};
+
struct dw_dma_chan {
struct dma_chan chan;
void __iomem *ch_regs;
struct dw_dma_chan {
struct dma_chan chan;
void __iomem *ch_regs;
@@
-134,10
+138,12
@@
struct dw_dma_chan {
spinlock_t lock;
/* these other elements are all protected by lock */
spinlock_t lock;
/* these other elements are all protected by lock */
+ unsigned long flags;
dma_cookie_t completed;
struct list_head active_list;
struct list_head queue;
struct list_head free_list;
dma_cookie_t completed;
struct list_head active_list;
struct list_head queue;
struct list_head free_list;
+ struct dw_cyclic_desc *cdesc;
unsigned int descs_allocated;
};
unsigned int descs_allocated;
};
@@
-158,7
+164,6
@@
static inline struct dw_dma_chan *to_dw_dma_chan(struct dma_chan *chan)
return container_of(chan, struct dw_dma_chan, chan);
}
return container_of(chan, struct dw_dma_chan, chan);
}
-
struct dw_dma {
struct dma_device dma;
void __iomem *regs;
struct dw_dma {
struct dma_device dma;
void __iomem *regs;