summaryrefslogtreecommitdiff
path: root/arch/arm/mach-bcm2708/Makefile
diff options
context:
space:
mode:
authorNoralf Trønnes <noralf@tronnes.org>2015-04-28 19:25:43 +0200
committerpopcornmix <popcornmix@gmail.com>2015-05-18 14:12:40 +0100
commiteb5eb47acfe280358f651959ce6d4317f21e6573 (patch)
treefc50f2fff914521944208007d6e482cd6a701ecf /arch/arm/mach-bcm2708/Makefile
parent8969dda249661e5a8760b92af60542b78cea50fd (diff)
downloadlinux-eb5eb47acfe280358f651959ce6d4317f21e6573.tar.gz
dmaengine: bcm2708: Merge with arch dma.c driver and disable dma.c
Merge the legacy DMA API driver with bcm2708-dmaengine. This is done so we can use bcm2708_fb on ARCH_BCM2835 (mailbox driver is also needed). Changes to the dma.c code: - Use BIT() macro. - Cutdown some comments to one line. - Add mutex to vc_dmaman and use this, since the dev lock is locked during probing of the engine part. - Add global g_dmaman variable since drvdata is used by the engine part. - Restructure for readability: vc_dmaman_chan_alloc() vc_dmaman_chan_free() bcm_dma_chan_free() - Restructure bcm_dma_chan_alloc() to simplify error handling. - Use device irq resources instead of hardcoded bcm_dma_irqs table. - Remove dev_dmaman_register() and code it directly. - Remove dev_dmaman_deregister() and code it directly. - Simplify bcm_dmaman_probe() using devm_* functions. - Get dmachans from DT if available. - Keep 'dma.dmachans' module argument name for backwards compatibility. Make it available on ARCH_BCM2835 as well. Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
Diffstat (limited to 'arch/arm/mach-bcm2708/Makefile')
-rw-r--r--arch/arm/mach-bcm2708/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-bcm2708/Makefile b/arch/arm/mach-bcm2708/Makefile
index 21e352166d9e..454408cbeade 100644
--- a/arch/arm/mach-bcm2708/Makefile
+++ b/arch/arm/mach-bcm2708/Makefile
@@ -2,6 +2,6 @@
# Makefile for the linux kernel.
#
-obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o vcio.o power.o dma.o
+obj-$(CONFIG_MACH_BCM2708) += bcm2708.o armctrl.o vcio.o power.o
obj-$(CONFIG_BCM2708_GPIO) += bcm2708_gpio.o
obj-$(CONFIG_BCM2708_VCMEM) += vc_mem.o