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

Commit b9c78022 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] move MAX_DMA_ADDRESS to mach/memory.h 



Move the definition of MAX_DMA_ADDRESS from mach/dma.h to mach/memory.h,
thereby placing it along side its relative, ISA_DMA_THRESHOLD.

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 5bed1fb3

arch/arm/include/asm/dma.h

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 
typedef unsigned int dmach_t;



#include <linux/spinlock.h>

#include <asm/memory.h>

#include <asm/system.h>

#include <asm/scatterlist.h>

#include <mach/dma.h>

arch/arm/mach-davinci/include/mach/dma.h

+0 −6
Original line number Diff line number Diff line
@@ -8,9 +8,3 @@ 
 * is licensed "as is" without any warranty of any kind, whether express

 * or implied.

 */
 
#ifndef __ASM_ARCH_DMA_H

#define __ASM_ARCH_DMA_H



#define MAX_DMA_ADDRESS			0xffffffff



#endif /* __ASM_ARCH_DMA_H */

arch/arm/mach-h720x/include/mach/dma.h

+0 −7
Original line number Diff line number Diff line
@@ -8,13 +8,6 @@ 
#ifndef __ASM_ARCH_DMA_H

#define __ASM_ARCH_DMA_H



/*

 * This is the maximum DMA address that can be DMAd to.

 * There should not be more than (0xd0000000 - 0xc0000000)

 * bytes of RAM.

 */

#define MAX_DMA_ADDRESS		0xd0000000



#if defined (CONFIG_CPU_H7201)

#define MAX_DMA_CHANNELS	3

#elif defined (CONFIG_CPU_H7202)

arch/arm/mach-h720x/include/mach/memory.h

+9 −0
Original line number Diff line number Diff line
@@ -8,5 +8,14 @@ 
#define __ASM_ARCH_MEMORY_H



#define PHYS_OFFSET	UL(0x40000000)

/*

 * This is the maximum DMA address that can be DMAd to.

 * There should not be more than (0xd0000000 - 0xc0000000)

 * bytes of RAM.

 *

 * If you set this, you must also set ISA_DMA_THRESHOLD and setup a DMA

 * zone if this does not cover all possible RAM.

 */

#define MAX_DMA_ADDRESS		0xd0000000



#endif

arch/arm/mach-ixp4xx/include/mach/dma.h

+0 −9
Original line number Diff line number Diff line
@@ -8,12 +8,3 @@ 
 * published by the Free Software Foundation.

 *

 */
 
#ifndef __ASM_ARCH_DMA_H

#define __ASM_ARCH_DMA_H



#include <asm/memory.h>

#include <asm/sizes.h>



#define MAX_DMA_ADDRESS		(PAGE_OFFSET + SZ_64M)



#endif /* _ASM_ARCH_DMA_H */