git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/asoc' into for-linus
[pandora-kernel.git]
/
arch
/
arm
/
plat-mxc
/
dma-mx1-mx2.c
diff --git
a/arch/arm/plat-mxc/dma-mx1-mx2.c
b/arch/arm/plat-mxc/dma-mx1-mx2.c
index
b296f19
..
e364a5e
100644
(file)
--- a/
arch/arm/plat-mxc/dma-mx1-mx2.c
+++ b/
arch/arm/plat-mxc/dma-mx1-mx2.c
@@
-34,7
+34,6
@@
#include <asm/system.h>
#include <asm/irq.h>
#include <mach/hardware.h>
#include <asm/system.h>
#include <asm/irq.h>
#include <mach/hardware.h>
-#include <asm/dma.h>
#include <mach/dma-mx1-mx2.h>
#define DMA_DCR 0x00 /* Control Register */
#include <mach/dma-mx1-mx2.h>
#define DMA_DCR 0x00 /* Control Register */
@@
-114,7
+113,7
@@
struct imx_dma_channel {
void (*err_handler) (int, void *, int errcode);
void (*prog_handler) (int, void *, struct scatterlist *);
void *data;
void (*err_handler) (int, void *, int errcode);
void (*prog_handler) (int, void *, struct scatterlist *);
void *data;
-
dmamode_t
dma_mode;
+
unsigned int
dma_mode;
struct scatterlist *sg;
unsigned int resbytes;
int dma_num;
struct scatterlist *sg;
unsigned int resbytes;
int dma_num;
@@
-193,7
+192,7
@@
static inline int imx_dma_sg_next(int channel, struct scatterlist *sg)
int
imx_dma_setup_single(int channel, dma_addr_t dma_address,
unsigned int dma_length, unsigned int dev_addr,
int
imx_dma_setup_single(int channel, dma_addr_t dma_address,
unsigned int dma_length, unsigned int dev_addr,
-
dmamode_
t dmamode)
+
unsigned in
t dmamode)
{
struct imx_dma_channel *imxdma = &imx_dma_channels[channel];
{
struct imx_dma_channel *imxdma = &imx_dma_channels[channel];
@@
-288,7
+287,7
@@
int
imx_dma_setup_sg(int channel,
struct scatterlist *sg, unsigned int sgcount,
unsigned int dma_length, unsigned int dev_addr,
imx_dma_setup_sg(int channel,
struct scatterlist *sg, unsigned int sgcount,
unsigned int dma_length, unsigned int dev_addr,
-
dmamode_
t dmamode)
+
unsigned in
t dmamode)
{
struct imx_dma_channel *imxdma = &imx_dma_channels[channel];
{
struct imx_dma_channel *imxdma = &imx_dma_channels[channel];
@@
-512,6
+511,7
@@
void imx_dma_disable(int channel)
}
EXPORT_SYMBOL(imx_dma_disable);
}
EXPORT_SYMBOL(imx_dma_disable);
+#ifdef CONFIG_ARCH_MX2
static void imx_dma_watchdog(unsigned long chno)
{
struct imx_dma_channel *imxdma = &imx_dma_channels[chno];
static void imx_dma_watchdog(unsigned long chno)
{
struct imx_dma_channel *imxdma = &imx_dma_channels[chno];
@@
-523,6
+523,7
@@
static void imx_dma_watchdog(unsigned long chno)
if (imxdma->err_handler)
imxdma->err_handler(chno, imxdma->data, IMX_DMA_ERR_TIMEOUT);
}
if (imxdma->err_handler)
imxdma->err_handler(chno, imxdma->data, IMX_DMA_ERR_TIMEOUT);
}
+#endif
static irqreturn_t dma_err_handler(int irq, void *dev_id)
{
static irqreturn_t dma_err_handler(int irq, void *dev_id)
{
@@
-675,7
+676,7
@@
int imx_dma_request(int channel, const char *name)
{
struct imx_dma_channel *imxdma = &imx_dma_channels[channel];
unsigned long flags;
{
struct imx_dma_channel *imxdma = &imx_dma_channels[channel];
unsigned long flags;
- int ret;
+ int ret
= 0
;
/* basic sanity checks */
if (!name)
/* basic sanity checks */
if (!name)
@@
-697,6
+698,7
@@
int imx_dma_request(int channel, const char *name)
ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA",
NULL);
if (ret) {
ret = request_irq(MXC_INT_DMACH0 + channel, dma_irq_handler, 0, "DMA",
NULL);
if (ret) {
+ local_irq_restore(flags);
printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n",
MXC_INT_DMACH0 + channel, channel);
return ret;
printk(KERN_CRIT "Can't register IRQ %d for DMA channel %d\n",
MXC_INT_DMACH0 + channel, channel);
return ret;
@@
-713,7
+715,7
@@
int imx_dma_request(int channel, const char *name)
imxdma->sg = NULL;
local_irq_restore(flags);
imxdma->sg = NULL;
local_irq_restore(flags);
- return
0
;
+ return
ret
;
}
EXPORT_SYMBOL(imx_dma_request);
}
EXPORT_SYMBOL(imx_dma_request);
@@
-800,7
+802,7
@@
static int __init imx_dma_init(void)
int ret = 0;
int i;
int ret = 0;
int i;
- dma_clk = clk_get(NULL, "dma
_clk
");
+ dma_clk = clk_get(NULL, "dma");
clk_enable(dma_clk);
/* reset DMA module */
clk_enable(dma_clk);
/* reset DMA module */