Add support for providing device to filter_fn mapping so client drivers can switch to use the dma_request_chan() API.
Unified · Split
| @@ -2297,6 +2297,10 @@ static int edma_probe(struct platform_device *pdev) · 2296 unmodified lines | |||
| 2297 | edma_set_chmap(&ecc->slave_chans[i], ecc->dummy_slot); | 2297 | edma_set_chmap(&ecc->slave_chans[i], ecc->dummy_slot); |
| 2298 | } | 2298 | } |
| 2299 | 2299 | ||
| 2300 | ecc->dma_slave.filter.map = info->slave_map; | ||
| 2301 | ecc->dma_slave.filter.mapcnt = info->slavecnt; | ||
| 2302 | ecc->dma_slave.filter.fn = edma_filter_fn; | ||
| 2303 | |||
| 2300 | ret = dma_async_device_register(&ecc->dma_slave); | 2304 | ret = dma_async_device_register(&ecc->dma_slave); |
| 2301 | if (ret) { | 2305 | if (ret) { |
| 2302 | dev_err(dev, "slave ddev registration failed (%d)\n", ret); | 2306 | dev_err(dev, "slave ddev registration failed (%d)\n", ret); |
| @@ -53,12 +53,16 @@ enum dma_event_q { · 52 unmodified lines | |||
| 53 | #define EDMA_CTLR(i) ((i) >> 16) | 53 | #define EDMA_CTLR(i) ((i) >> 16) |
| 54 | #define EDMA_CHAN_SLOT(i) ((i) & 0xffff) | 54 | #define EDMA_CHAN_SLOT(i) ((i) & 0xffff) |
| 55 | 55 | ||
| 56 | #define EDMA_FILTER_PARAM(ctlr, chan) ((int[]) { EDMA_CTLR_CHAN(ctlr, chan) }) | ||
| 57 | |||
| 56 | struct edma_rsv_info { | 58 | struct edma_rsv_info { |
| 57 | 59 | ||
| 58 | const s16 (*rsv_chans)[2]; | 60 | const s16 (*rsv_chans)[2]; |
| 59 | const s16 (*rsv_slots)[2]; | 61 | const s16 (*rsv_slots)[2]; |
| 60 | }; | 62 | }; |
| 61 | 63 | ||
| 64 | struct dma_slave_map; | ||
| 65 | |||
| 62 | /* platform_data for EDMA driver */ | 66 | /* platform_data for EDMA driver */ |
| 63 | struct edma_soc_info { | 67 | struct edma_soc_info { |
| 64 | /* | 68 | /* |
| @@ -76,6 +80,9 @@ struct edma_soc_info { · 11 unmodified lines | |||
| 76 | 80 | ||
| 77 | s8 (*queue_priority_mapping)[2]; | 81 | s8 (*queue_priority_mapping)[2]; |
| 78 | const s16 (*xbar_chans)[2]; | 82 | const s16 (*xbar_chans)[2]; |
| 83 | |||
| 84 | const struct dma_slave_map *slave_map; | ||
| 85 | int slavecnt; | ||
| 79 | }; | 86 | }; |
| 80 | 87 | ||
| 81 | #endif | 88 | #endif |