Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 10440af1 authored by Guennadi Liakhovetski's avatar Guennadi Liakhovetski Committed by Paul Mundt
Browse files

sh: define DMA slaves per CPU type, remove now redundant header 



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: default avatarGuennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: default avatarPaul Mundt <lethal@linux-sh.org>
parent 2d151248

arch/sh/include/asm/dmaengine.h

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * 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

arch/sh/include/asm/siu.h

+0 −2
Original line number Diff line number Diff line
@@ -11,8 +11,6 @@ 
#ifndef ASM_SIU_H

#define ASM_SIU_H



#include <asm/dmaengine.h>



struct device;



struct siu_platform {

arch/sh/include/cpu-sh4/cpu/sh7722.h

+15 −0
Original line number Diff line number Diff line
@@ -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__ */

arch/sh/include/cpu-sh4/cpu/sh7724.h

+19 −0
Original line number Diff line number Diff line
@@ -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__ */

arch/sh/kernel/cpu/sh4a/setup-sh7722.c

+0 −1
Original line number Diff line number Diff line
@@ -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>