Instead of relying on indexes pointing to edma private date in the global pointer array, pass the private data pointer via the public API.
Showing the changes to include/linux/platform_data (1 of 3 files). Show all
Unified · Split
| @@ -92,32 +92,40 @@ enum dma_event_q { · 91 unmodified lines | |||
| 92 | 92 | ||
| 93 | #define EDMA_MAX_CC 2 | 93 | #define EDMA_MAX_CC 2 |
| 94 | 94 | ||
| 95 | struct edma; | ||
| 96 | |||
| 97 | struct edma *edma_get_data(struct device *edma_dev); | ||
| 98 | |||
| 95 | /* alloc/free DMA channels and their dedicated parameter RAM slots */ | 99 | /* alloc/free DMA channels and their dedicated parameter RAM slots */ |
| 96 | int edma_alloc_channel(int channel, | 100 | int edma_alloc_channel(struct edma *cc, int channel, |
| 97 | void (*callback)(unsigned channel, u16 ch_status, void *data), | 101 | void (*callback)(unsigned channel, u16 ch_status, void *data), |
| 98 | void *data, enum dma_event_q); | 102 | void *data, enum dma_event_q); |
| 99 | void edma_free_channel(unsigned channel); | 103 | void edma_free_channel(struct edma *cc, unsigned channel); |
| 100 | 104 | ||
| 101 | /* alloc/free parameter RAM slots */ | 105 | /* alloc/free parameter RAM slots */ |
| 102 | int edma_alloc_slot(unsigned ctlr, int slot); | 106 | int edma_alloc_slot(struct edma *cc, int slot); |
| 103 | void edma_free_slot(unsigned slot); | 107 | void edma_free_slot(struct edma *cc, unsigned slot); |
| 104 | 108 | ||
| 105 | /* calls that operate on part of a parameter RAM slot */ | 109 | /* calls that operate on part of a parameter RAM slot */ |
| 106 | dma_addr_t edma_get_position(unsigned slot, bool dst); | 110 | dma_addr_t edma_get_position(struct edma *cc, unsigned slot, bool dst); |
| 107 | void edma_link(unsigned from, unsigned to); | 111 | void edma_link(struct edma *cc, unsigned from, unsigned to); |
| 108 | 112 | ||
| 109 | /* calls that operate on an entire parameter RAM slot */ | 113 | /* calls that operate on an entire parameter RAM slot */ |
| 110 | void edma_write_slot(unsigned slot, const struct edmacc_param *params); | 114 | void edma_write_slot(struct edma *cc, unsigned slot, |
| 111 | void edma_read_slot(unsigned slot, struct edmacc_param *params); | 115 | const struct edmacc_param *params); |
| 116 | void edma_read_slot(struct edma *cc, unsigned slot, | ||
| 117 | struct edmacc_param *params); | ||
| 112 | 118 | ||
| 113 | /* channel control operations */ | 119 | /* channel control operations */ |
| 114 | int edma_start(unsigned channel); | 120 | int edma_start(struct edma *cc, unsigned channel); |
| 115 | void edma_stop(unsigned channel); | 121 | void edma_stop(struct edma *cc, unsigned channel); |
| 116 | void edma_clean_channel(unsigned channel); | 122 | void edma_clean_channel(struct edma *cc, unsigned channel); |
| 117 | void edma_pause(unsigned channel); | 123 | void edma_pause(struct edma *cc, unsigned channel); |
| 118 | void edma_resume(unsigned channel); | 124 | void edma_resume(struct edma *cc, unsigned channel); |
| 125 | int edma_trigger_channel(struct edma *cc, unsigned channel); | ||
| 119 | 126 | ||
| 120 | void edma_assign_channel_eventq(unsigned channel, enum dma_event_q eventq_no); | 127 | void edma_assign_channel_eventq(struct edma *cc, unsigned channel, |
| 128 | enum dma_event_q eventq_no); | ||
| 121 | 129 | ||
| 122 | struct edma_rsv_info { | 130 | struct edma_rsv_info { |
| 123 | 131 | ||
| @@ -141,6 +149,4 @@ struct edma_soc_info { · 17 unmodified lines | |||
| 141 | const s16 (*xbar_chans)[2]; | 149 | const s16 (*xbar_chans)[2]; |
| 142 | }; | 150 | }; |
| 143 | 151 | ||
| 144 | int edma_trigger_channel(unsigned); | ||
| 145 | |||
| 146 | #endif | 152 | #endif |