History

ARM/dmaengine: edma: Merge the two drivers under drivers/dma/

Move the code out from arch/arm/common and merge it inside of the dmaengine driver. This change is done with as minimal (if eny) functional change to the code as possible to avoid introducing regression.

Peter Ujfalusi committed 11 years ago

Commit 2b6b3b71 parent cef5b0d8 files · +1431 −1587Browse files

Showing the changes to include/linux/platform_data (1 of 8 files). Show all

Unified · Split

include/linux/platform_data/edma.h+0−74
@@ -41,37 +41,6 @@ · 40 unmodified lines
4141 #ifndef EDMA_H_
4242 #define EDMA_H_
4343
44−/* PaRAM slots are laid out like this */
45−struct edmacc_param {
46− u32 opt;
47− u32 src;
48− u32 a_b_cnt;
49− u32 dst;
50− u32 src_dst_bidx;
51− u32 link_bcntrld;
52− u32 src_dst_cidx;
53− u32 ccnt;
54−} __packed;
55−
56−/* fields in edmacc_param.opt */
57−#define SAM BIT(0)
58−#define DAM BIT(1)
59−#define SYNCDIM BIT(2)
60−#define STATIC BIT(3)
61−#define EDMA_FWID (0x07 << 8)
62−#define TCCMODE BIT(11)
63−#define EDMA_TCC(t) ((t) << 12)
64−#define TCINTEN BIT(20)
65−#define ITCINTEN BIT(21)
66−#define TCCHEN BIT(22)
67−#define ITCCHEN BIT(23)
68−
69−/*ch_status paramater of callback function possible values*/
70−#define EDMA_DMA_COMPLETE 1
71−#define EDMA_DMA_CC_ERROR 2
72−#define EDMA_DMA_TC1_ERROR 3
73−#define EDMA_DMA_TC2_ERROR 4
74−
7544 enum dma_event_q {
7645 EVENTQ_0 = 0,
7746 EVENTQ_1 = 1,
@@ -84,49 +53,6 @@ enum dma_event_q { · 6 unmodified lines
8453 #define EDMA_CTLR(i) ((i) >> 16)
8554 #define EDMA_CHAN_SLOT(i) ((i) & 0xffff)
8655
87−#define EDMA_CHANNEL_ANY -1 /* for edma_alloc_channel() */
88−#define EDMA_SLOT_ANY -1 /* for edma_alloc_slot() */
89−#define EDMA_CONT_PARAMS_ANY 1001
90−#define EDMA_CONT_PARAMS_FIXED_EXACT 1002
91−#define EDMA_CONT_PARAMS_FIXED_NOT_EXACT 1003
92−
93−#define EDMA_MAX_CC 2
94−
95−struct edma;
96−
97−struct edma *edma_get_data(struct device *edma_dev);
98−
99−/* alloc/free DMA channels and their dedicated parameter RAM slots */
100−int edma_alloc_channel(struct edma *cc, int channel,
101− void (*callback)(unsigned channel, u16 ch_status, void *data),
102− void *data, enum dma_event_q);
103−void edma_free_channel(struct edma *cc, unsigned channel);
104−
105−/* alloc/free parameter RAM slots */
106−int edma_alloc_slot(struct edma *cc, int slot);
107−void edma_free_slot(struct edma *cc, unsigned slot);
108−
109−/* calls that operate on part of a parameter RAM slot */
110−dma_addr_t edma_get_position(struct edma *cc, unsigned slot, bool dst);
111−void edma_link(struct edma *cc, unsigned from, unsigned to);
112−
113−/* calls that operate on an entire parameter RAM slot */
114−void edma_write_slot(struct edma *cc, unsigned slot,
115− const struct edmacc_param *params);
116−void edma_read_slot(struct edma *cc, unsigned slot,
117− struct edmacc_param *params);
118−
119−/* channel control operations */
120−int edma_start(struct edma *cc, unsigned channel);
121−void edma_stop(struct edma *cc, unsigned channel);
122−void edma_clean_channel(struct edma *cc, unsigned channel);
123−void edma_pause(struct edma *cc, unsigned channel);
124−void edma_resume(struct edma *cc, unsigned channel);
125−int edma_trigger_channel(struct edma *cc, unsigned channel);
126−
127−void edma_assign_channel_eventq(struct edma *cc, unsigned channel,
128− enum dma_event_q eventq_no);
129−
13056 struct edma_rsv_info {
13157
13258 const s16 (*rsv_chans)[2];

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t