aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-05-19 05:30:31 -0400
committerPaul Mundt <lethal@linux-sh.org>2012-05-19 05:30:31 -0400
commit2ff9f317f15b7c3bd95273a7f04ca0b148850104 (patch)
tree9976dae25055dfd3b3bd89a63d111476a3b3ff87 /arch/sh
parent0c6012313c22154367c36cecbc949d0fc120042e (diff)
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>
Diffstat (limited to 'arch/sh')
-rw-r--r--arch/sh/include/asm/dma.h1
-rw-r--r--arch/sh/include/cpu-sh2/cpu/dma.h23
-rw-r--r--arch/sh/include/cpu-sh2a/cpu/dma.h1
-rw-r--r--arch/sh/include/cpu-sh3/cpu/dma.h7
-rw-r--r--arch/sh/include/cpu-sh4/cpu/dma.h9
-rw-r--r--arch/sh/include/cpu-sh4a/cpu/dma.h5
-rw-r--r--arch/sh/include/cpu-sh5/cpu/dma.h6
7 files changed, 0 insertions, 52 deletions
diff --git a/arch/sh/include/asm/dma.h b/arch/sh/include/asm/dma.h
index 6aa2080c0065..e6c2871a00e7 100644
--- a/arch/sh/include/asm/dma.h
+++ b/arch/sh/include/asm/dma.h
@@ -15,7 +15,6 @@
15#include <linux/wait.h> 15#include <linux/wait.h>
16#include <linux/sched.h> 16#include <linux/sched.h>
17#include <linux/device.h> 17#include <linux/device.h>
18#include <cpu/dma.h>
19#include <asm-generic/dma.h> 18#include <asm-generic/dma.h>
20 19
21#ifdef CONFIG_NR_DMA_CHANNELS 20#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
index d66b43cdc637..000000000000
--- a/arch/sh/include/cpu-sh2/cpu/dma.h
+++ /dev/null
@@ -1,23 +0,0 @@
1/*
2 * Definitions for the SH-2 DMAC.
3 *
4 * Copyright (C) 2003 Paul Mundt
5 *
6 * This file is subject to the terms and conditions of the GNU General Public
7 * License. See the file "COPYING" in the main directory of this archive
8 * for more details.
9 */
10#ifndef __ASM_CPU_SH2_DMA_H
11#define __ASM_CPU_SH2_DMA_H
12
13#define SH_MAX_DMA_CHANNELS 2
14
15#define SAR ((unsigned long[]){ 0xffffff80, 0xffffff90 })
16#define DAR ((unsigned long[]){ 0xffffff84, 0xffffff94 })
17#define DMATCR ((unsigned long[]){ 0xffffff88, 0xffffff98 })
18#define CHCR ((unsigned long[]){ 0xfffffffc, 0xffffff9c })
19
20#define DMAOR 0xffffffb0
21
22#endif /* __ASM_CPU_SH2_DMA_H */
23
diff --git a/arch/sh/include/cpu-sh2a/cpu/dma.h b/arch/sh/include/cpu-sh2a/cpu/dma.h
deleted file mode 100644
index 27a13ef4fdfc..000000000000
--- a/arch/sh/include/cpu-sh2a/cpu/dma.h
+++ /dev/null
@@ -1 +0,0 @@
1#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 27a90ad0bcec..bccb4144a5e3 100644
--- a/arch/sh/include/cpu-sh3/cpu/dma.h
+++ b/arch/sh/include/cpu-sh3/cpu/dma.h
@@ -15,11 +15,4 @@
15#define DMTE0_IRQ evt2irq(0x800) 15#define DMTE0_IRQ evt2irq(0x800)
16#define DMTE4_IRQ evt2irq(0xb80) 16#define DMTE4_IRQ evt2irq(0xb80)
17 17
18/* Definitions for the SuperH DMAC */
19#define TM_BURST 0x00000020
20#define TS_8 0x00000000
21#define TS_16 0x00000008
22#define TS_32 0x00000010
23#define TS_128 0x00000018
24
25#endif /* __ASM_CPU_SH3_DMA_H */ 18#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 6d7b66b6fe7e..a520eb219621 100644
--- a/arch/sh/include/cpu-sh4/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4/cpu/dma.h
@@ -14,13 +14,4 @@
14#define SH_DMAC_BASE0 0xffa00000 14#define SH_DMAC_BASE0 0xffa00000
15#define SH_DMAC_BASE1 0xffa00070 15#define SH_DMAC_BASE1 0xffa00070
16 16
17/* Definitions for the SuperH DMAC */
18#define TM_BURST 0x00000080
19#define TS_8 0x00000010
20#define TS_16 0x00000020
21#define TS_32 0x00000030
22#define TS_64 0x00000000
23
24#define DMAOR_COD 0x00000008
25
26#endif /* __ASM_CPU_SH4_DMA_H */ 17#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 f280410c93ae..c276313104c7 100644
--- a/arch/sh/include/cpu-sh4a/cpu/dma.h
+++ b/arch/sh/include/cpu-sh4a/cpu/dma.h
@@ -77,9 +77,4 @@
77#define SH_DMARS_BASE0 0xFC809000 77#define SH_DMARS_BASE0 0xFC809000
78#endif 78#endif
79 79
80#define REQ_HE 0x000000C0
81#define REQ_H 0x00000080
82#define REQ_LE 0x00000040
83#define TM_BURST 0x00000020
84
85#endif /* __ASM_SH_CPU_SH4_DMA_SH7780_H */ 80#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
index 7bf6bb3d35ed..000000000000
--- a/arch/sh/include/cpu-sh5/cpu/dma.h
+++ /dev/null
@@ -1,6 +0,0 @@
1#ifndef __ASM_SH_CPU_SH5_DMA_H
2#define __ASM_SH_CPU_SH5_DMA_H
3
4/* Nothing yet */
5
6#endif /* __ASM_SH_CPU_SH5_DMA_H */