sh: Tidy up some of the cpu legacy dma header mess.

This has turned in to quite a mess, and with CPUs that care using
dmaengine now it's about time to start cleaning up after the legacy DMA
code. For starters, kill off the stubs for the CPUs that don't do
anything, as well as all of the unused definitions. This leaves us with a
set of IRQs and base addresses we can deal with later.

Signed-off-by: Paul Mundt <lethal@linux-sh.org>

diff --git a/arch/sh/include/asm/dma.h b/arch/sh/include/asm/dma.h
index 6aa2080c0065c66a925b02e0cdd67b14e6007e5a..e6c2871a00e7f885b66d16637aaf57f70d89675c 100644 (file)
--- a/arch/sh/include/asm/dma.h
+++ b/arch/sh/include/asm/dma.h
@@ -15,7 +15,6 @@
 #include <linux/wait.h>
 #include <linux/sched.h>
 #include <linux/device.h>
-#include <cpu/dma.h>
 #include <asm-generic/dma.h>
 
 #ifdef CONFIG_NR_DMA_CHANNELS

diff --git a/arch/sh/include/cpu-sh2/cpu/dma.h b/arch/sh/include/cpu-sh2/cpu/dma.h
deleted file mode 100644 (file)
index d66b43c..0000000
--- a/arch/sh/include/cpu-sh2/cpu/dma.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
- * Definitions for the SH-2 DMAC.
- *
- * Copyright (C) 2003  Paul Mundt
- *
- * This file is subject to the terms and conditions of the GNU General Public
- * License.  See the file "COPYING" in the main directory of this archive
- * for more details.
- */
-#ifndef __ASM_CPU_SH2_DMA_H
-#define __ASM_CPU_SH2_DMA_H
-
-#define SH_MAX_DMA_CHANNELS    2
-
-#define SAR    ((unsigned long[]){ 0xffffff80, 0xffffff90 })
-#define DAR    ((unsigned long[]){ 0xffffff84, 0xffffff94 })
-#define DMATCR ((unsigned long[]){ 0xffffff88, 0xffffff98 })
-#define CHCR   ((unsigned long[]){ 0xfffffffc, 0xffffff9c })
-
-#define DMAOR  0xffffffb0
-
-#endif /* __ASM_CPU_SH2_DMA_H */
-

diff --git a/arch/sh/include/cpu-sh2a/cpu/dma.h b/arch/sh/include/cpu-sh2a/cpu/dma.h
deleted file mode 100644 (file)
index 27a13ef..0000000
--- a/arch/sh/include/cpu-sh2a/cpu/dma.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <cpu-sh2/cpu/dma.h>

diff --git a/arch/sh/include/cpu-sh3/cpu/dma.h b/arch/sh/include/cpu-sh3/cpu/dma.h
index 27a90ad0bcec3174948d63a180d160ac6c8e55b9..bccb4144a5e375f1a6413f7c28cf113a28d2ca2e 100644 (file)
--- a/arch/sh/include/cpu-sh3/cpu/dma.h
+++ b/arch/sh/include/cpu-sh3/cpu/dma.h
@@ -15,11 +15,4 @@
 #define DMTE0_IRQ      evt2irq(0x800)
 #define DMTE4_IRQ      evt2irq(0xb80)
 
-/* Definitions for the SuperH DMAC */
-#define TM_BURST       0x00000020
-#define TS_8           0x00000000
-#define TS_16          0x00000008
-#define TS_32          0x00000010
-#define TS_128         0x00000018
-
 #endif /* __ASM_CPU_SH3_DMA_H */

diff --git a/arch/sh/include/cpu-sh4/cpu/dma.h b/arch/sh/include/cpu-sh4/cpu/dma.h
index 6d7b66b6fe7ef6d42d87fff09d3c014e51798b7d..a520eb219621a71cd27f0bc9f97d8c574cf5ff31 100644 (file)
--- a/arch/sh/include/cpu-sh4/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma.h
@@ -14,13 +14,4 @@
 #define SH_DMAC_BASE0  0xffa00000
 #define SH_DMAC_BASE1  0xffa00070
 
-/* Definitions for the SuperH DMAC */
-#define TM_BURST       0x00000080
-#define TS_8           0x00000010
-#define TS_16          0x00000020
-#define TS_32          0x00000030
-#define TS_64          0x00000000
-
-#define DMAOR_COD      0x00000008
-
 #endif /* __ASM_CPU_SH4_DMA_H */

diff --git a/arch/sh/include/cpu-sh4a/cpu/dma.h b/arch/sh/include/cpu-sh4a/cpu/dma.h
index f280410c93aeae228ec539e32fb53b5f073067a8..c276313104c74383a9e1b8b541aa066e9c554c9f 100644 (file)
--- a/arch/sh/include/cpu-sh4a/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4a/cpu/dma.h
@@ -77,9 +77,4 @@
 #define SH_DMARS_BASE0 0xFC809000
 #endif
 
-#define REQ_HE         0x000000C0
-#define REQ_H          0x00000080
-#define REQ_LE         0x00000040
-#define TM_BURST       0x00000020
-
 #endif /* __ASM_SH_CPU_SH4_DMA_SH7780_H */

diff --git a/arch/sh/include/cpu-sh5/cpu/dma.h b/arch/sh/include/cpu-sh5/cpu/dma.h
deleted file mode 100644 (file)
index 7bf6bb3..0000000
--- a/arch/sh/include/cpu-sh5/cpu/dma.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef __ASM_SH_CPU_SH5_DMA_H
-#define __ASM_SH_CPU_SH5_DMA_H
-
-/* Nothing yet */
-
-#endif /* __ASM_SH_CPU_SH5_DMA_H */