File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -568,38 +568,6 @@ config ST_FDMA
568568 Say Y here if you have such a chipset.
569569 If unsure, say N.
570570
571- config STM32_DMA
572- bool "STMicroelectronics STM32 DMA support"
573- depends on ARCH_STM32 || COMPILE_TEST
574- select DMA_ENGINE
575- select DMA_VIRTUAL_CHANNELS
576- help
577- Enable support for the on-chip DMA controller on STMicroelectronics
578- STM32 MCUs.
579- If you have a board based on such a MCU and wish to use DMA say Y
580- here.
581-
582- config STM32_DMAMUX
583- bool "STMicroelectronics STM32 dma multiplexer support"
584- depends on STM32_DMA || COMPILE_TEST
585- help
586- Enable support for the on-chip DMA multiplexer on STMicroelectronics
587- STM32 MCUs.
588- If you have a board based on such a MCU and wish to use DMAMUX say Y
589- here.
590-
591- config STM32_MDMA
592- bool "STMicroelectronics STM32 master dma support"
593- depends on ARCH_STM32 || COMPILE_TEST
594- depends on OF
595- select DMA_ENGINE
596- select DMA_VIRTUAL_CHANNELS
597- help
598- Enable support for the on-chip MDMA controller on STMicroelectronics
599- STM32 platforms.
600- If you have a board based on STM32 SoC and wish to use the master DMA
601- say Y here.
602-
603571config SPRD_DMA
604572 tristate "Spreadtrum DMA support"
605573 depends on ARCH_SPRD || COMPILE_TEST
@@ -772,6 +740,8 @@ source "drivers/dma/fsl-dpaa2-qdma/Kconfig"
772740
773741source "drivers/dma/lgm/Kconfig"
774742
743+ source "drivers/dma/stm32/Kconfig"
744+
775745# clients
776746comment "DMA Clients"
777747 depends on DMA_ENGINE
Original file line number Diff line number Diff line change @@ -70,9 +70,6 @@ obj-$(CONFIG_PXA_DMA) += pxa_dma.o
7070obj-$(CONFIG_RENESAS_DMA) += sh/
7171obj-$(CONFIG_SF_PDMA) += sf-pdma/
7272obj-$(CONFIG_STE_DMA40) += ste_dma40.o ste_dma40_ll.o
73- obj-$(CONFIG_STM32_DMA) += stm32-dma.o
74- obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o
75- obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o
7673obj-$(CONFIG_SPRD_DMA) += sprd-dma.o
7774obj-$(CONFIG_TXX9_DMAC) += txx9dmac.o
7875obj-$(CONFIG_TEGRA186_GPC_DMA) += tegra186-gpc-dma.o
@@ -88,5 +85,6 @@ obj-$(CONFIG_INTEL_LDMA) += lgm/
8885
8986obj-y += mediatek/
9087obj-y += qcom/
88+ obj-y += stm32/
9189obj-y += ti/
9290obj-y += xilinx/
Original file line number Diff line number Diff line change 1+ # SPDX-License-Identifier: GPL-2.0-only
2+ #
3+ # STM32 DMA controllers drivers
4+ #
5+ if ARCH_STM32 || COMPILE_TEST
6+
7+ config STM32_DMA
8+ bool "STMicroelectronics STM32 DMA support"
9+ select DMA_ENGINE
10+ select DMA_VIRTUAL_CHANNELS
11+ help
12+ Enable support for the on-chip DMA controller on STMicroelectronics
13+ STM32 platforms.
14+ If you have a board based on STM32 SoC with such DMA controller
15+ and want to use DMA say Y here.
16+
17+ config STM32_DMAMUX
18+ bool "STMicroelectronics STM32 DMA multiplexer support"
19+ depends on STM32_DMA
20+ help
21+ Enable support for the on-chip DMA multiplexer on STMicroelectronics
22+ STM32 platforms.
23+ If you have a board based on STM32 SoC with such DMA multiplexer
24+ and want to use DMAMUX say Y here.
25+
26+ config STM32_MDMA
27+ bool "STMicroelectronics STM32 master DMA support"
28+ depends on OF
29+ select DMA_ENGINE
30+ select DMA_VIRTUAL_CHANNELS
31+ help
32+ Enable support for the on-chip MDMA controller on STMicroelectronics
33+ STM32 platforms.
34+ If you have a board based on STM32 SoC with such DMA controller
35+ and want to use MDMA say Y here.
36+
37+ endif
Original file line number Diff line number Diff line change 1+ # SPDX-License-Identifier: GPL-2.0-only
2+ obj-$(CONFIG_STM32_DMA) += stm32-dma.o
3+ obj-$(CONFIG_STM32_DMAMUX) += stm32-dmamux.o
4+ obj-$(CONFIG_STM32_MDMA) += stm32-mdma.o
Original file line number Diff line number Diff line change 2828#include <linux/sched.h>
2929#include <linux/slab.h>
3030
31- #include "virt-dma.h"
31+ #include "../ virt-dma.h"
3232
3333#define STM32_DMA_LISR 0x0000 /* DMA Low Int Status Reg */
3434#define STM32_DMA_HISR 0x0004 /* DMA High Int Status Reg */
File renamed without changes.
Original file line number Diff line number Diff line change 3030#include <linux/reset.h>
3131#include <linux/slab.h>
3232
33- #include "virt-dma.h"
33+ #include "../ virt-dma.h"
3434
3535#define STM32_MDMA_GISR0 0x0000 /* MDMA Int Status Reg 1 */
3636
You can’t perform that action at this time.
0 commit comments