Skip to contentSkip to conversation

ARM: SAMSUNG: remove unused DMA infrastructure

PATCH New Arnd Bergmann 4 participants 4 messages Jan 15, 2015 – Jan 23, 2015

Subsystems (5)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: SAMSUNG: remove unused DMA infrastructure

Everything uses dmaengine now, so there is no reason to keep this around any longer. Thanks to everyone who was involved in moving the users over to use the dmaengine APIs.

---
 Documentation/arm/Samsung-S3C24XX/DMA.txt        |   46 -
 arch/arm/mach-exynos/include/mach/dma.h          |   26 -
 arch/arm/mach-s3c24xx/Kconfig                    |   42 -
 arch/arm/mach-s3c24xx/Makefile                   |    7 -
 arch/arm/mach-s3c24xx/dma-s3c2410.c              |  182 ---
 arch/arm/mach-s3c24xx/dma-s3c2412.c              |  150 ---
 arch/arm/mach-s3c24xx/dma-s3c2440.c              |  193 ---
 arch/arm/mach-s3c24xx/dma-s3c2443.c              |  179 ---
 arch/arm/mach-s3c24xx/dma.c                      | 1465 ----------------------
 arch/arm/mach-s3c24xx/include/mach/dma.h         |  159 ---
 arch/arm/mach-s3c64xx/include/mach/dma.h         |   15 -
 arch/arm/plat-samsung/Kconfig                    |   15 -
 arch/arm/plat-samsung/Makefile                   |    6 -
 arch/arm/plat-samsung/dma-ops.c                  |  146 ---
 arch/arm/plat-samsung/dma.c                      |   84 --
 arch/arm/plat-samsung/include/plat/dma-core.h    |   22 -
 arch/arm/plat-samsung/include/plat/dma-ops.h     |   69 -
 arch/arm/plat-samsung/include/plat/dma-pl330.h   |  121 --
 arch/arm/plat-samsung/include/plat/dma-s3c24xx.h |   73 --
 arch/arm/plat-samsung/include/plat/dma.h         |  130 --
 arch/arm/plat-samsung/include/plat/regs-dma.h    |  151 ---
 arch/arm/plat-samsung/s3c-dma-ops.c              |  146 ---
 drivers/dma/Kconfig                              |    2 +-
 23 files changed, 1 insertion(+), 3428 deletions(-)
Documentation/arm/Samsung-S3C24XX/DMA.txt deleted +0 -46
deleted file mode 100644
index 3ed82383efea..000000000000
@@ -1,46 +0,0 @@
-			S3C2410 DMA
-			===========
-
-Introduction
-------------
-
-   The kernel provides an interface to manage DMA transfers
-   using the DMA channels in the CPU, so that the central
-   duty of managing channel mappings, and programming the
-   channel generators is in one place.
-
-
-DMA Channel Ordering
---------------------
-
-   Many of the range do not have connections for the DMA
-   channels to all sources, which means that some devices
-   have a restricted number of channels that can be used.
-
-   To allow flexibility for each CPU type and board, the
-   DMA code can be given a DMA ordering structure which
-   allows the order of channel search to be specified, as
-   well as allowing the prohibition of certain claims.
-
-   struct s3c24xx_dma_order has a list of channels, and
-   each channel within has a slot for a list of DMA
-   channel numbers. The slots are searched in order for
-   the presence of a DMA channel number with DMA_CH_VALID
-   or-ed in.
-
-   If the order has the flag DMA_CH_NEVER set, then after
-   checking the channel list, the system will return no
-   found channel, thus denying the request.
-
-   A board support file can call s3c24xx_dma_order_set()
-   to register a complete ordering set. The routine will
-   copy the data, so the original can be discarded with
-   __initdata.
-
-
-Authour
--------
-
-Ben Dooks,
-Copyright (c) 2007 Ben Dooks, Simtec Electronics
-Licensed under the GPL v2
arch/arm/mach-exynos/include/mach/dma.h deleted +0 -26
deleted file mode 100644
index 201842a3769e..000000000000
@@ -1,26 +0,0 @@
-/*
- * Copyright (C) 2010 Samsung Electronics Co. Ltd.
- *	Jaswinder Singh <[email protected]>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- */
-
-#ifndef __MACH_DMA_H
-#define __MACH_DMA_H
-
-/* This platform uses the common DMA API driver for PL330 */
-#include <plat/dma-pl330.h>
-
-#endif /* __MACH_DMA_H */
arch/arm/mach-s3c24xx/Kconfig +0 -42

102 lines not on this page · raw message

arch/arm/mach-s3c24xx/Makefile +0 -7
index b92071638733..b40a22fe082a 100644
@@ -12,12 +12,10 @@
 obj-y				+= common.o
 
 obj-$(CONFIG_CPU_S3C2410)	+= s3c2410.o
-obj-$(CONFIG_S3C2410_DMA)	+= dma-s3c2410.o
 obj-$(CONFIG_S3C2410_PLL)	+= pll-s3c2410.o
 obj-$(CONFIG_S3C2410_PM)	+= pm-s3c2410.o sleep-s3c2410.o
 
 obj-$(CONFIG_CPU_S3C2412)	+= s3c2412.o
-obj-$(CONFIG_S3C2412_DMA)	+= dma-s3c2412.o
 obj-$(CONFIG_S3C2412_PM)	+= pm-s3c2412.o
 obj-$(CONFIG_S3C2412_PM_SLEEP)	+= sleep-s3c2412.o
 
@@ -27,7 +25,6 @@ obj-$(CONFIG_S3C2416_PM)	+= pm-s3c2416.o
 obj-$(CONFIG_CPU_S3C2440)	+= s3c2440.o
 obj-$(CONFIG_CPU_S3C2442)	+= s3c2442.o
 obj-$(CONFIG_CPU_S3C244X)	+= s3c244x.o
-obj-$(CONFIG_S3C2440_DMA)	+= dma-s3c2440.o
 obj-$(CONFIG_S3C2440_PLL_12000000) += pll-s3c2440-12000000.o
 obj-$(CONFIG_S3C2440_PLL_16934400) += pll-s3c2440-16934400.o
 
@@ -39,15 +36,11 @@ obj-$(CONFIG_PM)		+= pm.o irq-pm.o sleep.o
 
 # common code
 
-obj-$(CONFIG_S3C24XX_DMA)	+= dma.o
-
 obj-$(CONFIG_S3C2410_CPUFREQ_UTILS) += cpufreq-utils.o
 
 obj-$(CONFIG_S3C2410_IOTIMING)	+= iotiming-s3c2410.o
 obj-$(CONFIG_S3C2412_IOTIMING)	+= iotiming-s3c2412.o
 
-obj-$(CONFIG_S3C2443_DMA)	+= dma-s3c2443.o
-
 #
 # machine support
 # following is ordered alphabetically by option text.
arch/arm/mach-s3c24xx/dma-s3c2410.c deleted +0 -182

182 lines not on this page · raw message

arch/arm/mach-s3c24xx/dma-s3c2412.c deleted +0 -150

150 lines not on this page · raw message

arch/arm/mach-s3c24xx/dma-s3c2440.c deleted +0 -193

193 lines not on this page · raw message

arch/arm/mach-s3c24xx/dma-s3c2443.c deleted +0 -179

179 lines not on this page · raw message

arch/arm/mach-s3c24xx/dma.c deleted +0 -1465

1,465 lines not on this page · raw message

arch/arm/mach-s3c24xx/include/mach/dma.h +0 -159

169 lines not on this page · raw message

arch/arm/mach-s3c64xx/include/mach/dma.h +0 -15
index 059b1fc85037..096e14073bd9 100644
@@ -51,21 +51,6 @@ enum dma_ch {
 	DMACH_MAX = 32
 };
 
-struct s3c2410_dma_client {
-	char	*name;
-};
-
-static inline bool samsung_dma_has_circular(void)
-{
-	return true;
-}
-
-static inline bool samsung_dma_is_dmadev(void)
-{
-	return true;
-}
-
 #include <linux/amba/pl08x.h>
-#include <plat/dma-ops.h>
 
 #endif /* __ASM_ARCH_IRQ_H */
arch/arm/plat-samsung/Kconfig +0 -15
index 9bd2776e7d05..cb8e3d655d1a 100644
@@ -236,13 +236,6 @@ config S3C_SETUP_CAMIF
 	help
 	  Compile in common setup code for S3C CAMIF devices
 
-# DMA
-
-config S3C_DMA
-	bool
-	help
-	  Internal configuration for S3C DMA core
-
 config SAMSUNG_PM_GPIO
 	bool
 	default y if GPIO_SAMSUNG && PM
@@ -250,14 +243,6 @@ config SAMSUNG_PM_GPIO
 	  Include legacy GPIO power management code for platforms not using
 	  pinctrl-samsung driver.
 
-config SAMSUNG_DMADEV
-	bool "Use legacy Samsung DMA abstraction"
-	depends on CPU_S5PV210 || ARCH_S3C64XX
-	select DMADEVICES
-	default y
-	help
-	  Use DMA device engine for PL330 DMAC.
-
 endif
 
 config S5P_DEV_MFC
arch/arm/plat-samsung/Makefile +0 -6
index 87746c37f030..1a29ab1f446d 100644
@@ -26,12 +26,6 @@ obj-$(CONFIG_SAMSUNG_DEV_BACKLIGHT)	+= dev-backlight.o
 
 obj-$(CONFIG_S3C_SETUP_CAMIF)	+= setup-camif.o
 
-# DMA support
-
-obj-$(CONFIG_S3C_DMA)		+= dma.o s3c-dma-ops.o
-
-obj-$(CONFIG_SAMSUNG_DMADEV)	+= dma-ops.o
-
 # PM support
 
 obj-$(CONFIG_PM_SLEEP)		+= pm-common.o
arch/arm/plat-samsung/dma-ops.c deleted +0 -146

146 lines not on this page · raw message

arch/arm/plat-samsung/dma.c deleted +0 -84

84 lines not on this page · raw message

arch/arm/plat-samsung/include/plat/dma-core.h deleted +0 -22
deleted file mode 100644
index 32ff2a92cb3c..000000000000
@@ -1,22 +0,0 @@
-/* arch/arm/plat-s3c/include/plat/dma.h
- *
- * Copyright 2008 Openmoko, Inc.
- * Copyright 2008 Simtec Electronics
- *	Ben Dooks <[email protected]>
- *	http://armlinux.simtec.co.uk/
- *
- * Samsung S3C DMA core support
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
-*/
-
-extern struct s3c2410_dma_chan *s3c_dma_lookup_channel(unsigned int channel);
-
-extern struct s3c2410_dma_chan *s3c_dma_chan_map[];
-
-/* the currently allocated channel information */
-extern struct s3c2410_dma_chan s3c2410_chans[];
-
-
arch/arm/plat-samsung/include/plat/dma-ops.h deleted +0 -69

69 lines not on this page · raw message

arch/arm/plat-samsung/include/plat/dma-pl330.h deleted +0 -121

73 lines not on this page · raw message

arch/arm/plat-samsung/include/plat/dma-s3c24xx.h deleted +0 -73

73 lines not on this page · raw message

arch/arm/plat-samsung/include/plat/dma.h deleted +0 -130

130 lines not on this page · raw message

arch/arm/plat-samsung/include/plat/regs-dma.h deleted +0 -151

151 lines not on this page · raw message

arch/arm/plat-samsung/s3c-dma-ops.c deleted +0 -146

146 lines not on this page · raw message

drivers/dma/Kconfig +1 -1
index f2b2c4e87aef..faf30a4e642b 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Part of the diff is not shown here. View the raw message.

#1 lore raw

PATCH 1/1 ARM: SAMSUNG: remove unused DMA infrastructure

Am Donnerstag, 15. Januar 2015, 16:16:03 schrieb Arnd Bergmann:

Quoted 5 lines

Everything uses dmaengine now, so there is no reason to keep this around any longer. Thanks to everyone who was involved in moving the users over to use the dmaengine APIs.

very nice to see this finished :-)

#2 lore raw

PATCH 1/1 ARM: SAMSUNG: remove unused DMA infrastructure

In reply to Arnd Bergmann
Quoted 3 lines · Arnd Bergmann

Everything uses dmaengine now, so there is no reason to keep this around any longer. Thanks to everyone who was involved in moving the users over to use the dmaengine APIs.

Very good indeed :)

Signature · 1 line
~Vinod
#3 lore raw

PATCH 1/1 ARM: SAMSUNG: remove unused DMA infrastructure

Quoted 9 lines · Vinod Koul
Quoted 3 lines · Arnd Bergmann

Everything uses dmaengine now, so there is no reason to keep this around any longer. Thanks to everyone who was involved in moving the users over to use the dmaengine APIs.

Very good indeed :)

Very nice and thanks to you all guys.

I'll apply this clean-up in Samsung tree with Heiko's reviewed-by.

- Kukjin