sh: define DMA slaves per CPU type, remove now redundant header
authorGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Wed, 19 May 2010 18:33:54 +0000 (18:33 +0000)
committerPaul Mundt <lethal@linux-sh.org>
Sat, 22 May 2010 07:51:17 +0000 (16:51 +0900)
Now that DMA slave IDs are only used used in platform specific code and have
become opaque cookies for the rest of the code, we can make the, CPU specific
too.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
arch/sh/include/asm/dmaengine.h [deleted file]
arch/sh/include/asm/siu.h
arch/sh/include/cpu-sh4/cpu/sh7722.h
arch/sh/include/cpu-sh4/cpu/sh7724.h
arch/sh/kernel/cpu/sh4a/setup-sh7722.c
arch/sh/kernel/cpu/sh4a/setup-sh7724.c
arch/sh/kernel/cpu/sh4a/setup-sh7780.c
arch/sh/kernel/cpu/sh4a/setup-sh7785.c
sound/soc/sh/siu.h
sound/soc/sh/siu_pcm.c

diff --git a/arch/sh/include/asm/dmaengine.h b/arch/sh/include/asm/dmaengine.h
deleted file mode 100644 (file)
index 2a02b61..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Header for the new SH dmaengine driver
- *
- * Copyright (C) 2010 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
- *
- * 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.
- */
-#ifndef ASM_DMAENGINE_H
-#define ASM_DMAENGINE_H
-
-#include <linux/sh_dma.h>
-
-enum {
-       SHDMA_SLAVE_SCIF0_TX,
-       SHDMA_SLAVE_SCIF0_RX,
-       SHDMA_SLAVE_SCIF1_TX,
-       SHDMA_SLAVE_SCIF1_RX,
-       SHDMA_SLAVE_SCIF2_TX,
-       SHDMA_SLAVE_SCIF2_RX,
-       SHDMA_SLAVE_SCIF3_TX,
-       SHDMA_SLAVE_SCIF3_RX,
-       SHDMA_SLAVE_SCIF4_TX,
-       SHDMA_SLAVE_SCIF4_RX,
-       SHDMA_SLAVE_SCIF5_TX,
-       SHDMA_SLAVE_SCIF5_RX,
-       SHDMA_SLAVE_SIUA_TX,
-       SHDMA_SLAVE_SIUA_RX,
-       SHDMA_SLAVE_SIUB_TX,
-       SHDMA_SLAVE_SIUB_RX,
-};
-
-#endif
index e8d4142baf59f9377ca55ab3ad85ef42039b3003..1d95c78808d13cfaab77145d91921f76517aa205 100644 (file)
@@ -11,8 +11,6 @@
 #ifndef ASM_SIU_H
 #define ASM_SIU_H
 
-#include <asm/dmaengine.h>
-
 struct device;
 
 struct siu_platform {
index 48560407cbe1c92acff99ff7fb858a4f5b1172a8..7a5b8a331b4aa55f6d7141486fd6153491c4a4a6 100644 (file)
@@ -235,4 +235,19 @@ enum {
        HWBLK_NR,
 };
 
+enum {
+       SHDMA_SLAVE_SCIF0_TX,
+       SHDMA_SLAVE_SCIF0_RX,
+       SHDMA_SLAVE_SCIF1_TX,
+       SHDMA_SLAVE_SCIF1_RX,
+       SHDMA_SLAVE_SCIF2_TX,
+       SHDMA_SLAVE_SCIF2_RX,
+       SHDMA_SLAVE_SIUA_TX,
+       SHDMA_SLAVE_SIUA_RX,
+       SHDMA_SLAVE_SIUB_TX,
+       SHDMA_SLAVE_SIUB_RX,
+       SHDMA_SLAVE_SDHI0_TX,
+       SHDMA_SLAVE_SDHI0_RX,
+};
+
 #endif /* __ASM_SH7722_H__ */
index 0cd1f71a11168e52d1d4fa51e324a26a95eb2793..fbbf550cc529c10d3ebbb8aa010de963d3a842fc 100644 (file)
@@ -283,4 +283,23 @@ enum {
        HWBLK_NR,
 };
 
+enum {
+       SHDMA_SLAVE_SCIF0_TX,
+       SHDMA_SLAVE_SCIF0_RX,
+       SHDMA_SLAVE_SCIF1_TX,
+       SHDMA_SLAVE_SCIF1_RX,
+       SHDMA_SLAVE_SCIF2_TX,
+       SHDMA_SLAVE_SCIF2_RX,
+       SHDMA_SLAVE_SCIF3_TX,
+       SHDMA_SLAVE_SCIF3_RX,
+       SHDMA_SLAVE_SCIF4_TX,
+       SHDMA_SLAVE_SCIF4_RX,
+       SHDMA_SLAVE_SCIF5_TX,
+       SHDMA_SLAVE_SCIF5_RX,
+       SHDMA_SLAVE_SDHI0_TX,
+       SHDMA_SLAVE_SDHI0_RX,
+       SHDMA_SLAVE_SDHI1_TX,
+       SHDMA_SLAVE_SDHI1_RX,
+};
+
 #endif /* __ASM_SH7724_H__ */
index 24c6167a718187c0f21148f13e37fa8672253196..c7219de6c4e4759bd5227d69bb46eee8d8fb1559 100644 (file)
@@ -17,7 +17,6 @@
 #include <linux/usb/m66592.h>
 
 #include <asm/clock.h>
-#include <asm/dmaengine.h>
 #include <asm/mmzone.h>
 #include <asm/siu.h>
 
index 89fe16d20fdb5149119264625a86aec201d4177a..abd4c2e501db24799fd838b943abacbae7a3b3e9 100644 (file)
 #include <linux/mm.h>
 #include <linux/serial_sci.h>
 #include <linux/uio_driver.h>
+#include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
 #include <linux/io.h>
 #include <linux/notifier.h>
 
 #include <asm/suspend.h>
 #include <asm/clock.h>
-#include <asm/dmaengine.h>
 #include <asm/mmzone.h>
 
 #include <cpu/dma-register.h>
index b12f537e4dde39077f6e4e16bbe59a17e0ac0693..0f414864f76b2e42a49bd26705834b550fca02b5 100644 (file)
 #include <linux/serial.h>
 #include <linux/io.h>
 #include <linux/serial_sci.h>
+#include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
 
-#include <asm/dmaengine.h>
-
 #include <cpu/dma-register.h>
 
 static struct plat_sci_port scif0_platform_data = {
index f3e3ea0ce050061e6920d0bcfb81862b79f1ec76..c9a572bc6dc84c78f00f61ceb7bf342378e17697 100644 (file)
@@ -13,9 +13,9 @@
 #include <linux/serial_sci.h>
 #include <linux/io.h>
 #include <linux/mm.h>
+#include <linux/sh_dma.h>
 #include <linux/sh_timer.h>
 
-#include <asm/dmaengine.h>
 #include <asm/mmzone.h>
 
 #include <cpu/dma-register.h>
index c0bfab8fed3d8258730b9577345f8c979740dec2..492b1cae24ccb3dcd3b36681866aca923e78752b 100644 (file)
@@ -71,8 +71,7 @@ struct siu_firmware {
 #include <linux/dmaengine.h>
 #include <linux/interrupt.h>
 #include <linux/io.h>
-
-#include <asm/dmaengine.h>
+#include <linux/sh_dma.h>
 
 #include <sound/core.h>
 #include <sound/pcm.h>
index 8f85719212f96283351a9381a2419afc8adf2d96..36170be15aa7453cfacf00505d18d162b369ca32 100644 (file)
@@ -31,7 +31,6 @@
 #include <sound/pcm_params.h>
 #include <sound/soc-dai.h>
 
-#include <asm/dmaengine.h>
 #include <asm/siu.h>
 
 #include "siu.h"
@@ -358,13 +357,13 @@ static int siu_pcm_open(struct snd_pcm_substream *ss)
        if (ss->stream == SNDRV_PCM_STREAM_PLAYBACK) {
                siu_stream = &port_info->playback;
                param = &siu_stream->param;
-               param->slave_id = port ? SHDMA_SLAVE_SIUB_TX :
-                       SHDMA_SLAVE_SIUA_TX;
+               param->slave_id = port ? pdata->dma_slave_tx_b :
+                       pdata->dma_slave_tx_a;
        } else {
                siu_stream = &port_info->capture;
                param = &siu_stream->param;
-               param->slave_id = port ? SHDMA_SLAVE_SIUB_RX :
-                       SHDMA_SLAVE_SIUA_RX;
+               param->slave_id = port ? pdata->dma_slave_rx_b :
+                       pdata->dma_slave_rx_a;
        }
 
        param->dma_dev = pdata->dma_dev;