evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'dma_complete' into next

Browse source
This commit is contained in:
Vinod Koul 2013-10-31 22:36:01 +05:30
commit f8d9f628e1
3 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm/common/edma.c
View file

@ -404,7 +404,7 @@ static irqreturn_t dma_irq_handler(int irq, void *data)
BIT(slot)); BIT(slot));
if (edma_cc[ctlr]->intr_data[channel].callback) if (edma_cc[ctlr]->intr_data[channel].callback)
edma_cc[ctlr]->intr_data[channel].callback( edma_cc[ctlr]->intr_data[channel].callback(
channel, DMA_COMPLETE, channel, EDMA_DMA_COMPLETE,
edma_cc[ctlr]->intr_data[channel].data); edma_cc[ctlr]->intr_data[channel].data);
} }
} while (sh_ipr); } while (sh_ipr);
@ -459,7 +459,7 @@ static irqreturn_t dma_ccerr_handler(int irq, void *data)
callback) { callback) {
edma_cc[ctlr]->intr_data[k]. edma_cc[ctlr]->intr_data[k].
callback(k, callback(k,
DMA_CC_ERROR, EDMA_DMA_CC_ERROR,
edma_cc[ctlr]->intr_data edma_cc[ctlr]->intr_data
[k].data); [k].data);
} }

4
drivers/dma/edma.c
View file

@ -471,7 +471,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
edma_pause(echan->ch_num); edma_pause(echan->ch_num);
switch (ch_status) { switch (ch_status) {
case DMA_COMPLETE: case EDMA_DMA_COMPLETE:
spin_lock_irqsave(&echan->vchan.lock, flags); spin_lock_irqsave(&echan->vchan.lock, flags);
edesc = echan->edesc; edesc = echan->edesc;
@ -490,7 +490,7 @@ static void edma_callback(unsigned ch_num, u16 ch_status, void *data)
spin_unlock_irqrestore(&echan->vchan.lock, flags); spin_unlock_irqrestore(&echan->vchan.lock, flags);
break; break;
case DMA_CC_ERROR: case EDMA_DMA_CC_ERROR:
spin_lock_irqsave(&echan->vchan.lock, flags); spin_lock_irqsave(&echan->vchan.lock, flags);
edma_read_slot(EDMA_CHAN_SLOT(echan->slot[0]), &p); edma_read_slot(EDMA_CHAN_SLOT(echan->slot[0]), &p);

8
include/linux/platform_data/edma.h
View file

@ -67,10 +67,10 @@ struct edmacc_param {
#define ITCCHEN BIT(23) #define ITCCHEN BIT(23)
/*ch_status paramater of callback function possible values*/ /*ch_status paramater of callback function possible values*/
#define DMA_COMPLETE 1 #define EDMA_DMA_COMPLETE 1
#define DMA_CC_ERROR 2 #define EDMA_DMA_CC_ERROR 2
#define DMA_TC1_ERROR 3 #define EDMA_DMA_TC1_ERROR 3
#define DMA_TC2_ERROR 4 #define EDMA_DMA_TC2_ERROR 4
enum address_mode { enum address_mode {
INCR = 0, INCR = 0,