diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2006-01-16 22:14:09 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-16 23:15:27 -0800 |
| commit | 0d831770b154a057562236e8cf50905c8f1ae1b0 (patch) | |
| tree | dc25902b29b09838f2fe32e47be53c951a2fa67e /arch/sh/drivers/dma/dma-g2.c | |
| parent | 0025835cf20e07056b8521b8c1d7d0bfe07e81f1 (diff) | |
| download | op-kernel-dev-0d831770b154a057562236e8cf50905c8f1ae1b0.zip op-kernel-dev-0d831770b154a057562236e8cf50905c8f1ae1b0.tar.gz | |
[PATCH] sh: DMA updates
This extends the current SH DMA API somewhat to support a proper virtual
channel abstraction, and also works to represent this through the driver model
by giving each DMAC its own platform device.
There's also a few other minor changes to support a few new CPU subtypes, and
make TEI generation for the SH DMAC configurable.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh/drivers/dma/dma-g2.c')
| -rw-r--r-- | arch/sh/drivers/dma/dma-g2.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/drivers/dma/dma-g2.c b/arch/sh/drivers/dma/dma-g2.c index 231e3f6..5afab6f 100644 --- a/arch/sh/drivers/dma/dma-g2.c +++ b/arch/sh/drivers/dma/dma-g2.c @@ -140,7 +140,7 @@ static struct dma_ops g2_dma_ops = { }; static struct dma_info g2_dma_info = { - .name = "G2 DMA", + .name = "g2_dmac", .nr_channels = 4, .ops = &g2_dma_ops, .flags = DMAC_CHANNELS_TEI_CAPABLE, @@ -160,6 +160,7 @@ static int __init g2_dma_init(void) static void __exit g2_dma_exit(void) { free_irq(HW_EVENT_G2_DMA, 0); + unregister_dmac(&g2_dma_info); } subsys_initcall(g2_dma_init); |
