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

Commit 0cd21ebc authored by Russell King's avatar Russell King
Browse files

Merge branch 'dma-size' of git://git.yxit.co.uk/linux into devel-stable

parents fcb8ce5c 97fef8bd

arch/arm/include/asm/dma-mapping.h

+7 −0
Original line number Diff line number Diff line
@@ -205,6 +205,13 @@ extern void *dma_alloc_writecombine(struct device *, size_t, dma_addr_t *, 
int dma_mmap_writecombine(struct device *, struct vm_area_struct *,

		void *, dma_addr_t, size_t);



/*

 * This can be called during boot to increase the size of the consistent

 * DMA region above it's default value of 2MB. It must be called before the

 * memory allocator is initialised, i.e. before any core_initcall.

 */

extern void __init init_consistent_dma_size(unsigned long size);





#ifdef CONFIG_DMABOUNCE

/*

arch/arm/include/asm/memory.h

+0 −9
Original line number Diff line number Diff line
@@ -77,16 +77,7 @@ 
 */

#define IOREMAP_MAX_ORDER	24



/*

 * Size of DMA-consistent memory region.  Must be multiple of 2M,

 * between 2MB and 14MB inclusive.

 */

#ifndef CONSISTENT_DMA_SIZE

#define CONSISTENT_DMA_SIZE 	SZ_2M

#endif



#define CONSISTENT_END		(0xffe00000UL)

#define CONSISTENT_BASE		(CONSISTENT_END - CONSISTENT_DMA_SIZE)



#else /* CONFIG_MMU */

arch/arm/mach-at91/at91sam9g45.c

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <linux/module.h>

#include <linux/pm.h>

#include <linux/dma-mapping.h>



#include <asm/irq.h>

#include <asm/mach/arch.h>
@@ -319,6 +320,7 @@ static void at91sam9g45_poweroff(void) 
static void __init at91sam9g45_map_io(void)

{

	at91_init_sram(0, AT91SAM9G45_SRAM_BASE, AT91SAM9G45_SRAM_SIZE);

	init_consistent_dma_size(SZ_4M);

}



static void __init at91sam9g45_initialize(void)

arch/arm/mach-at91/include/mach/at91sam9g45.h

+0 −2
Original line number Diff line number Diff line
@@ -128,8 +128,6 @@ 
#define AT91SAM9G45_EHCI_BASE	0x00800000	/* USB Host controller (EHCI) */

#define AT91SAM9G45_VDEC_BASE	0x00900000	/* Video Decoder Controller */



#define CONSISTENT_DMA_SIZE	SZ_4M



/*

 * DMA peripheral identifiers

 * for hardware handshaking interface

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

+0 −5
Original line number Diff line number Diff line
@@ -25,9 +25,4 @@ 


#define PLAT_PHYS_OFFSET CFG_GLOBAL_RAM_BASE



/*

 * Maximum DMA memory allowed is 14M

 */

#define CONSISTENT_DMA_SIZE (SZ_16M - SZ_2M)



#endif