diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:59:05 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-06-21 17:59:05 +0900 |
| commit | f448e9c9dad6fb919ec74cd1b2c189efe952886f (patch) | |
| tree | ebc7eafdef4ed53eec1679f6607ef825c08bf201 /include | |
| parent | 9dd056e9eba106ef622795b566f769a9ab0a49a8 (diff) | |
| parent | 260bf2c5f69f419b04b6861ca91565b5fb16ce48 (diff) | |
| download | linux-f448e9c9dad6fb919ec74cd1b2c189efe952886f.tar.gz linux-f448e9c9dad6fb919ec74cd1b2c189efe952886f.tar.bz2 linux-f448e9c9dad6fb919ec74cd1b2c189efe952886f.zip | |
Merge branch 'common/dma' into sh-latest
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sh_dma.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/sh_dma.h b/include/linux/sh_dma.h index b08cd4efa15c..cb2dd118cc0f 100644 --- a/include/linux/sh_dma.h +++ b/include/linux/sh_dma.h @@ -62,6 +62,12 @@ struct sh_dmae_pdata { const unsigned int *ts_shift; int ts_shift_num; u16 dmaor_init; + unsigned int chcr_offset; + u32 chcr_ie_bit; + + unsigned int dmaor_is_32bit:1; + unsigned int needs_tend_set:1; + unsigned int no_dmars:1; }; /* DMA register */ @@ -71,6 +77,8 @@ struct sh_dmae_pdata { #define CHCR 0x0C #define DMAOR 0x40 +#define TEND 0x18 /* USB-DMAC */ + /* DMAOR definitions */ #define DMAOR_AE 0x00000004 #define DMAOR_NMIF 0x00000002 |