diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 14:45:42 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-02 14:45:42 -0400 |
| commit | 0a276d1675bc1b8de3ba269ba64b8f3e288d8309 (patch) | |
| tree | ff552f58874b245f5962487ef53ce27ebcda5857 /include | |
| parent | 25aa6a7ae46c6a041c46a2d314b9ab7c4f2baa41 (diff) | |
| parent | 08298f0612e5e369d1da89b92cac5d2c71ddb9af (diff) | |
Merge tag 'sh-for-linus' of git://github.com/pmundt/linux-sh
Pull SuperH fixes from Paul Mundt.
* tag 'sh-for-linus' of git://github.com/pmundt/linux-sh: (24 commits)
sh: explicitly include sh_dma.h in setup-sh7722.c
sh: ecovec: care CN5 VBUS if USB host mode
sh: sh7724: fixup renesas_usbhs clock settings
sh: intc: initial irqdomain support.
sh: pfc: Fix up init ordering mess.
serial: sh-sci: fix compilation breakage, when DMA is enabled
dmaengine: shdma: restore partial transfer calculation
sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757
sh: Fix up recursive fault in oops with unset TTB.
sh: pfc: Build fix for pinctrl_remove_gpio_range() changes.
sh: select the fixed regulator driver on several boards
sh: ecovec: switch MMC power control to regulators
sh: add fixed voltage regulators to se7724
sh: add fixed voltage regulators to sdk7786
sh: add fixed voltage regulators to rsk
sh: add fixed voltage regulators to migor
sh: add fixed voltage regulators to kfr2r09
sh: add fixed voltage regulators to ap325rxa
sh: add fixed voltage regulators to sh7757lcr
sh: add fixed voltage regulators to sh2007
...
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/shdma-base.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/shdma-base.h b/include/linux/shdma-base.h index 93f9821554b6..a3728bf66f0e 100644 --- a/include/linux/shdma-base.h +++ b/include/linux/shdma-base.h | |||
| @@ -50,6 +50,7 @@ struct shdma_desc { | |||
| 50 | struct list_head node; | 50 | struct list_head node; |
| 51 | struct dma_async_tx_descriptor async_tx; | 51 | struct dma_async_tx_descriptor async_tx; |
| 52 | enum dma_transfer_direction direction; | 52 | enum dma_transfer_direction direction; |
| 53 | size_t partial; | ||
| 53 | dma_cookie_t cookie; | 54 | dma_cookie_t cookie; |
| 54 | int chunks; | 55 | int chunks; |
| 55 | int mark; | 56 | int mark; |
| @@ -98,6 +99,7 @@ struct shdma_ops { | |||
| 98 | void (*start_xfer)(struct shdma_chan *, struct shdma_desc *); | 99 | void (*start_xfer)(struct shdma_chan *, struct shdma_desc *); |
| 99 | struct shdma_desc *(*embedded_desc)(void *, int); | 100 | struct shdma_desc *(*embedded_desc)(void *, int); |
| 100 | bool (*chan_irq)(struct shdma_chan *, int); | 101 | bool (*chan_irq)(struct shdma_chan *, int); |
| 102 | size_t (*get_partial)(struct shdma_chan *, struct shdma_desc *); | ||
| 101 | }; | 103 | }; |
| 102 | 104 | ||
| 103 | struct shdma_dev { | 105 | struct shdma_dev { |
