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

Commit 90aaa53c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge master.kernel.org:/home/rmk/linux-2.6-arm 

* master.kernel.org:/home/rmk/linux-2.6-arm:
  [ARM] cdb89712: avoid namespace clashes with SRAM_ and BOOTROM_ constants
  [ARM] cdb89712,clps7500,h720x: avoid namespace clash for FLASH_* constants
  [ARM] integrator,realview,versatile: remove FLASH_* and EPROM_* constants
  [ARM] dma-mapping: fix compiler warning
  [ARM] iop: iop3xx needs registers mapped uncached+unbuffered
  [ARM] versatile: correct MMC clock rate
  [ARM] realview: correct MMC clock rate
  [ARM] 5329/1: Feroceon: fix feroceon_l2_inv_range
parents 906bf113 8959dabd

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

+11 −2
Original line number Diff line number Diff line
@@ -256,8 +256,17 @@ int dmabounce_sync_for_cpu(struct device *, dma_addr_t, unsigned long, 
int dmabounce_sync_for_device(struct device *, dma_addr_t, unsigned long,

		size_t, enum dma_data_direction);

#else

#define dmabounce_sync_for_cpu(dev,dma,off,sz,dir)	(1)

#define dmabounce_sync_for_device(dev,dma,off,sz,dir)	(1)

static inline int dmabounce_sync_for_cpu(struct device *d, dma_addr_t addr,

	unsigned long offset, size_t size, enum dma_data_direction dir)

{

	return 1;

}



static inline int dmabounce_sync_for_device(struct device *d, dma_addr_t addr,

	unsigned long offset, size_t size, enum dma_data_direction dir)

{

	return 1;

}





/**

arch/arm/include/asm/mach/map.h

+7 −6
Original line number Diff line number Diff line
@@ -19,12 +19,13 @@ struct map_desc { 
};



/* types 0-3 are defined in asm/io.h */

#define MT_CACHECLEAN		4

#define MT_MINICLEAN		5

#define MT_LOW_VECTORS		6

#define MT_HIGH_VECTORS		7

#define MT_MEMORY		8

#define MT_ROM			9

#define MT_UNCACHED		4

#define MT_CACHECLEAN		5

#define MT_MINICLEAN		6

#define MT_LOW_VECTORS		7

#define MT_HIGH_VECTORS		8

#define MT_MEMORY		9

#define MT_ROM			10



#ifdef CONFIG_MMU

extern void iotable_init(struct map_desc *, int);

arch/arm/mach-clps711x/include/mach/hardware.h

+0 −22
Original line number Diff line number Diff line
@@ -94,20 +94,6 @@ 
#include <asm/hardware/ep7212.h>

#include <asm/hardware/cs89712.h>



/* dynamic ioremap() areas */

#define FLASH_START      0x00000000

#define FLASH_SIZE       0x800000

#define FLASH_WIDTH      4



#define SRAM_START       0x60000000

#define SRAM_SIZE        0xc000

#define SRAM_WIDTH       4



#define BOOTROM_START    0x70000000

#define BOOTROM_SIZE     0x80

#define BOOTROM_WIDTH    4





/* static cdb89712_map_io() areas */

#define REGISTER_START   0x80000000

#define REGISTER_SIZE    0x4000
@@ -198,14 +184,6 @@ 
#define CEIVA_FLASH_SIZE        0x100000

#define CEIVA_FLASH_WIDTH       2



#define SRAM_START       0x60000000

#define SRAM_SIZE        0xc000

#define SRAM_WIDTH       4



#define BOOTROM_START    0x70000000

#define BOOTROM_SIZE     0x80

#define BOOTROM_WIDTH    4



/*

 * SED1355 LCD controller

 */

arch/arm/mach-clps7500/core.c

+3 −3
Original line number Diff line number Diff line
@@ -275,9 +275,9 @@ static struct map_desc cl7500_io_desc[] __initdata = { 
		.length		= ISA_SIZE,

		.type		= MT_DEVICE

	}, {	/* Flash	*/

		.virtual	= FLASH_BASE,

		.pfn		= __phys_to_pfn(FLASH_START),

		.length		= FLASH_SIZE,

		.virtual	= CLPS7500_FLASH_BASE,

		.pfn		= __phys_to_pfn(CLPS7500_FLASH_START),

		.length		= CLPS7500_FLASH_SIZE,

		.type		= MT_DEVICE

	}, {	/* LED		*/

		.virtual	= LED_BASE,

arch/arm/mach-clps7500/include/mach/hardware.h

+3 −3
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#define ISA_SIZE		0x00010000

#define ISA_BASE		0xe1000000



#define FLASH_START		0x01000000	/* XXX */

#define FLASH_SIZE		0x01000000

#define FLASH_BASE		0xe2000000

#define CLPS7500_FLASH_START	0x01000000	/* XXX */

#define CLPS7500_FLASH_SIZE	0x01000000

#define CLPS7500_FLASH_BASE	0xe2000000



#define LED_START		0x0302B000

#define LED_SIZE		0x00001000