diff options
| author | Olof Johansson <olof@lixom.net> | 2018-07-18 07:50:50 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-07-18 07:50:50 -0700 |
| commit | 380d685923515ce75e90697539ee6b24b35350c0 (patch) | |
| tree | 0265b0a517527c855e5f82c2e820ccee3b7d1f76 /include/linux/platform_data | |
| parent | ce8403d455430afb2317757bb755a0f27a2799db (diff) | |
| parent | cbc654c88178b7dc3b63f57278cb917ffdb629cc (diff) | |
| download | cachepc-linux-380d685923515ce75e90697539ee6b24b35350c0.tar.gz cachepc-linux-380d685923515ce75e90697539ee6b24b35350c0.zip | |
Merge tag 'pxa-for-4.19-v2' of https://github.com/rjarzmik/linux into next/soc
This is the pxa changes for 4.19 cycle :
- the pxa architecture is ported to dma slavemap
- some minor AC97 fixes
- some minor board fixes
* tag 'pxa-for-4.19-v2' of https://github.com/rjarzmik/linux:
net: smc91x: remove the dmaengine compat need
net: smc911x: remove the dmaengine compat need
ARM: pxa: zylonite: use the new ac97 bus support
ARM: pxa: add the missing AC97 clocks
ARM: pxa: mioa701 convert to the new AC97 bus
ARM: pxa: hx4700: fix the usb client
ARM: pxa: change SSP DMA channels allocation
ARM: pxa: remove the DMA IO resources
dmaengine: pxa: document pxad_param
ata: pata_pxa: remove the dmaengine compat need
mtd: rawnand: marvell: remove the dmaengine compat need
media: pxa_camera: remove the dmaengine compat need
mmc: pxamci: remove the dmaengine compat need
dmaengine: pxa: add a default requestor policy
ARM: pxa: add dma slave map
dmaengine: pxa: use a dma slave map
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'include/linux/platform_data')
| -rw-r--r-- | include/linux/platform_data/mmp_dma.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/platform_data/mmp_dma.h b/include/linux/platform_data/mmp_dma.h index d1397c8ed94e..6397b9c8149a 100644 --- a/include/linux/platform_data/mmp_dma.h +++ b/include/linux/platform_data/mmp_dma.h @@ -12,9 +12,13 @@ #ifndef MMP_DMA_H #define MMP_DMA_H +struct dma_slave_map; + struct mmp_dma_platdata { int dma_channels; int nb_requestors; + int slave_map_cnt; + const struct dma_slave_map *slave_map; }; #endif /* MMP_DMA_H */ |