diff options
author | Tony Lindgren <tony@atomide.com> | 2006-06-27 01:16:15 +0200 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2006-06-27 01:16:15 +0200 |
commit | 7ff879dbcd2083c95933a56bce65ae45ecab3f35 (patch) | |
tree | ba34240578d5d8cebf58ad9e5f23d22d3eed2d5a /drivers | |
parent | ARM: OMAP: OMAP2 DMA burst support (diff) | |
download | linux-7ff879dbcd2083c95933a56bce65ae45ecab3f35.tar.xz linux-7ff879dbcd2083c95933a56bce65ae45ecab3f35.zip |
ARM: OMAP: Fix DMA channel irq handling for omap24xx
- DMA CSR register is cleared by reading on omap1, but on
omap2 it is cleard by writing to it.
- DMA TOUT interrupt does not exist on omap24xx, rename it
- Add SECURE and MISALIGNED errors by default for omap24xx
- Add defines for external DMA request lines
Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/mmc/omap.c | 2 | ||||
-rw-r--r-- | drivers/usb/gadget/omap_udc.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mmc/omap.c b/drivers/mmc/omap.c index c25244b3657b..4aa1e56235c9 100644 --- a/drivers/mmc/omap.c +++ b/drivers/mmc/omap.c @@ -663,7 +663,7 @@ static void mmc_omap_dma_cb(int lch, u16 ch_status, void *data) return; } /* FIXME: We really should do something to _handle_ the errors */ - if (ch_status & OMAP_DMA_TOUT_IRQ) { + if (ch_status & OMAP1_DMA_TOUT_IRQ) { dev_err(mmc_dev(host->mmc),"DMA timeout\n"); return; } diff --git a/drivers/usb/gadget/omap_udc.c b/drivers/usb/gadget/omap_udc.c index fbea51448909..36336486c883 100644 --- a/drivers/usb/gadget/omap_udc.c +++ b/drivers/usb/gadget/omap_udc.c @@ -773,7 +773,7 @@ static void dma_error(int lch, u16 ch_status, void *data) struct omap_ep *ep = data; /* if ch_status & OMAP_DMA_DROP_IRQ ... */ - /* if ch_status & OMAP_DMA_TOUT_IRQ ... */ + /* if ch_status & OMAP1_DMA_TOUT_IRQ ... */ ERR("%s dma error, lch %d status %02x\n", ep->ep.name, lch, ch_status); /* complete current transfer ... */ |