2022-04-19 16:45:52

by Arnd Bergmann

Subject: [PATCH 22/41] ARM: omap1: move plat/dma.c to mach/omap-dma.c

From: Arnd Bergmann <[email protected]>

Most of the interface functions in plat/dma.c are only used from the
USB driver, which is practically OMAP1 specific, except for compile
testing.

The omap_get_plat_info(), omap_request_dma() and omap_free_dma()
functions are never called on omap2 because of runtime checks.

Signed-off-by: Arnd Bergmann <[email protected]>
---
arch/arm/mach-omap1/Makefile | 2 +-
arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} | 0
arch/arm/plat-omap/Makefile | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} (100%)

diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index 450bbf552b57..0615cb0ba580 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -5,7 +5,7 @@

# Common support
obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \
- serial.o devices.o dma.o fb.o
+ serial.o devices.o dma.o omap-dma.o fb.o
obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o

ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/mach-omap1/omap-dma.c
similarity index 100%
rename from arch/arm/plat-omap/dma.c
rename to arch/arm/mach-omap1/omap-dma.c
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 68ccec9de106..5d55295a14ee 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -6,4 +6,4 @@
ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include

# Common support
-obj-y := sram.o dma.o
+obj-y := sram.o
--
2.29.2

2022-05-03 00:22:31

by Péter Ujfalusi

Subject: Re: [PATCH 22/41] ARM: omap1: move plat/dma.c to mach/omap-dma.c

On 4/19/22 16:37, Arnd Bergmann wrote:
> From: Arnd Bergmann <[email protected]>
>
> Most of the interface functions in plat/dma.c are only used from the
> USB driver, which is practically OMAP1 specific, except for compile
> testing.
>
> The omap_get_plat_info(), omap_request_dma() and omap_free_dma()
> functions are never called on omap2 because of runtime checks.

Reviewed-by: Peter Ujfalusi <[email protected]>

> Signed-off-by: Arnd Bergmann <[email protected]>
> ---
> arch/arm/mach-omap1/Makefile | 2 +-
> arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} | 0
> arch/arm/plat-omap/Makefile | 2 +-
> 3 files changed, 2 insertions(+), 2 deletions(-)
> rename arch/arm/{plat-omap/dma.c => mach-omap1/omap-dma.c} (100%)
>
> diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
> index 450bbf552b57..0615cb0ba580 100644
> --- a/arch/arm/mach-omap1/Makefile
> +++ b/arch/arm/mach-omap1/Makefile
> @@ -5,7 +5,7 @@
>
> # Common support
> obj-y := io.o id.o sram-init.o sram.o time.o irq.o mux.o flash.o \
> - serial.o devices.o dma.o fb.o
> + serial.o devices.o dma.o omap-dma.o fb.o
> obj-y += clock.o clock_data.o opp_data.o reset.o pm_bus.o timer.o
>
> ifneq ($(CONFIG_SND_SOC_OMAP_MCBSP),)
> diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/mach-omap1/omap-dma.c
> similarity index 100%
> rename from arch/arm/plat-omap/dma.c
> rename to arch/arm/mach-omap1/omap-dma.c
> diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
> index 68ccec9de106..5d55295a14ee 100644
> --- a/arch/arm/plat-omap/Makefile
> +++ b/arch/arm/plat-omap/Makefile
> @@ -6,4 +6,4 @@
> ccflags-$(CONFIG_ARCH_MULTIPLATFORM) := -I$(srctree)/arch/arm/plat-omap/include
>
> # Common support
> -obj-y := sram.o dma.o
> +obj-y := sram.o

--
Péter