diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2018-07-03 06:57:48 +0200 |
|---|---|---|
| committer | Ulf Hansson <ulf.hansson@linaro.org> | 2018-07-03 06:57:48 +0200 |
| commit | 399c4129eba6145924ab90363352b7bdcd554751 (patch) | |
| tree | 5a76475fd540b16f36faf3d67a5a4cdd0fe1dcf1 /include | |
| parent | 021c91791a5e7e85c567452f1be3e4c2c6cb6063 (diff) | |
| parent | cd31b80736852d34bc1072f3e579a6fd73a244e7 (diff) | |
Merge tag 'pxa-for-4.19-dma_slave_map' of https://github.com/rjarzmik/linux
Pull in branch for switching pxa to DMA slave maps, from Robert Jarzmik.
This is needed due to dependencies of changes for the pxamci mmc driver.
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/dma/pxa-dma.h | 9 | ||||
| -rw-r--r-- | include/linux/platform_data/mmp_dma.h | 4 | ||||
| -rw-r--r-- | include/linux/pxa2xx_ssp.h | 2 |
3 files changed, 13 insertions, 2 deletions
diff --git a/include/linux/dma/pxa-dma.h b/include/linux/dma/pxa-dma.h index e56ec7af4fd7..9fc594f69eff 100644 --- a/include/linux/dma/pxa-dma.h +++ b/include/linux/dma/pxa-dma.h @@ -9,6 +9,15 @@ enum pxad_chan_prio { PXAD_PRIO_LOWEST, }; +/** + * struct pxad_param - dma channel request parameters + * @drcmr: requestor line number + * @prio: minimal mandatory priority of the channel + * + * If a requested channel is granted, its priority will be at least @prio, + * ie. if PXAD_PRIO_LOW is required, the requested channel will be either + * PXAD_PRIO_LOW, PXAD_PRIO_NORMAL or PXAD_PRIO_HIGHEST. + */ struct pxad_param { unsigned int drcmr; enum pxad_chan_prio prio; 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 */ diff --git a/include/linux/pxa2xx_ssp.h b/include/linux/pxa2xx_ssp.h index 8461b18e4608..03a7ca46735b 100644 --- a/include/linux/pxa2xx_ssp.h +++ b/include/linux/pxa2xx_ssp.h @@ -212,8 +212,6 @@ struct ssp_device { int type; int use_count; int irq; - int drcmr_rx; - int drcmr_tx; struct device_node *of_node; }; |