| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677787980818283848586878889909192939495969798 |
- From c64813bbb6d293b06994bd8ca2de6075953d8879 Mon Sep 17 00:00:00 2001
- From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org>
- Date: Sat, 3 Oct 2015 22:22:55 +0200
- Subject: [PATCH 022/381] dmaengine: bcm2835: Load driver early and support
- legacy API
- MIME-Version: 1.0
- Content-Type: text/plain; charset=UTF-8
- Content-Transfer-Encoding: 8bit
- Load driver early since at least bcm2708_fb doesn't support deferred
- probing and even if it did, we don't want the video driver deferred.
- Support the legacy DMA API which is needed by bcm2708_fb.
- Don't mask out channel 2.
- Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
- ---
- drivers/dma/Kconfig | 2 +-
- drivers/dma/bcm2835-dma.c | 30 ++++++++++++++++++++++++------
- 2 files changed, 25 insertions(+), 7 deletions(-)
- --- a/drivers/dma/Kconfig
- +++ b/drivers/dma/Kconfig
- @@ -108,7 +108,7 @@ config COH901318
-
- config DMA_BCM2835
- tristate "BCM2835 DMA engine support"
- - depends on ARCH_BCM2835
- + depends on ARCH_BCM2835 || ARCH_BCM2708 || ARCH_BCM2709
- select DMA_ENGINE
- select DMA_VIRTUAL_CHANNELS
-
- --- a/drivers/dma/bcm2835-dma.c
- +++ b/drivers/dma/bcm2835-dma.c
- @@ -36,6 +36,7 @@
- #include <linux/interrupt.h>
- #include <linux/list.h>
- #include <linux/module.h>
- +#include <linux/platform_data/dma-bcm2708.h>
- #include <linux/platform_device.h>
- #include <linux/slab.h>
- #include <linux/io.h>
- @@ -786,6 +787,10 @@ static int bcm2835_dma_probe(struct plat
- if (IS_ERR(base))
- return PTR_ERR(base);
-
- + rc = bcm_dmaman_probe(pdev, base, BCM2835_DMA_BULK_MASK);
- + if (rc)
- + dev_err(&pdev->dev, "Failed to initialize the legacy API\n");
- +
- od->base = base;
-
- dma_cap_set(DMA_SLAVE, od->ddev.cap_mask);
- @@ -818,11 +823,8 @@ static int bcm2835_dma_probe(struct plat
- goto err_no_dma;
- }
-
- - /*
- - * Do not use the FIQ and BULK channels,
- - * because they are used by the GPU.
- - */
- - chans_available &= ~(BCM2835_DMA_FIQ_MASK | BCM2835_DMA_BULK_MASK);
- + /* Channel 0 is used by the legacy API */
- + chans_available &= ~BCM2835_DMA_BULK_MASK;
-
- for (i = 0; i < pdev->num_resources; i++) {
- irq = platform_get_irq(pdev, i);
- @@ -866,6 +868,7 @@ static int bcm2835_dma_remove(struct pla
- {
- struct bcm2835_dmadev *od = platform_get_drvdata(pdev);
-
- + bcm_dmaman_remove(pdev);
- dma_async_device_unregister(&od->ddev);
- bcm2835_dma_free(od);
-
- @@ -881,7 +884,22 @@ static struct platform_driver bcm2835_dm
- },
- };
-
- -module_platform_driver(bcm2835_dma_driver);
- +static int bcm2835_dma_init(void)
- +{
- + return platform_driver_register(&bcm2835_dma_driver);
- +}
- +
- +static void bcm2835_dma_exit(void)
- +{
- + platform_driver_unregister(&bcm2835_dma_driver);
- +}
- +
- +/*
- + * Load after serial driver (arch_initcall) so we see the messages if it fails,
- + * but before drivers (module_init) that need a DMA channel.
- + */
- +subsys_initcall(bcm2835_dma_init);
- +module_exit(bcm2835_dma_exit);
-
- MODULE_ALIAS("platform:bcm2835-dma");
- MODULE_DESCRIPTION("BCM2835 DMA engine driver");
|
