From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sun, 28 Aug 2011 09:41:19 +0000 (+0100)
Subject: Merge branch 'devel-stable' into for-next
X-Git-Tag: next-20110829~93^2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=3ad29450aa243a318fae5d50bdc918760436bb02;p=karo-tx-linux.git

Merge branch 'devel-stable' into for-next

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
	arch/arm/mach-msm/board-msm7x30.c
	arch/arm/mm/dma-mapping.c
---

3ad29450aa243a318fae5d50bdc918760436bb02
diff --cc arch/arm/mach-imx/mach-cpuimx27.c
index f851fe903687,881add0fbe5b..b1ec2cf53bb0
--- a/arch/arm/mach-imx/mach-cpuimx27.c
+++ b/arch/arm/mach-imx/mach-cpuimx27.c
@@@ -310,8 -310,8 +310,8 @@@ static struct sys_timer eukrea_cpuimx27
  	.init = eukrea_cpuimx27_timer_init,
  };
  
 -MACHINE_START(CPUIMX27, "EUKREA CPUIMX27")
 +MACHINE_START(EUKREA_CPUIMX27, "EUKREA CPUIMX27")
- 	.boot_params = MX27_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
  	.map_io = mx27_map_io,
  	.init_early = imx27_init_early,
  	.init_irq = mx27_init_irq,
diff --cc arch/arm/mach-imx/mach-cpuimx35.c
index 4bd083ba9af2,10b89139da48..470b654b0e6e
--- a/arch/arm/mach-imx/mach-cpuimx35.c
+++ b/arch/arm/mach-imx/mach-cpuimx35.c
@@@ -192,9 -192,9 +192,9 @@@ struct sys_timer eukrea_cpuimx35_timer 
  	.init	= eukrea_cpuimx35_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX35, "Eukrea CPUIMX35")
 +MACHINE_START(EUKREA_CPUIMX35SD, "Eukrea CPUIMX35")
  	/* Maintainer: Eukrea Electromatique */
- 	.boot_params = MX3x_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
  	.map_io = mx35_map_io,
  	.init_early = imx35_init_early,
  	.init_irq = mx35_init_irq,
diff --cc arch/arm/mach-imx/mach-eukrea_cpuimx25.c
index 2442d5da883d,d8699b54268d..9163318e95a2
--- a/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
+++ b/arch/arm/mach-imx/mach-eukrea_cpuimx25.c
@@@ -161,9 -161,9 +161,9 @@@ static struct sys_timer eukrea_cpuimx25
  	.init   = eukrea_cpuimx25_timer_init,
  };
  
 -MACHINE_START(EUKREA_CPUIMX25, "Eukrea CPUIMX25")
 +MACHINE_START(EUKREA_CPUIMX25SD, "Eukrea CPUIMX25")
  	/* Maintainer: Eukrea Electromatique */
- 	.boot_params = MX25_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
  	.map_io = mx25_map_io,
  	.init_early = imx25_init_early,
  	.init_irq = mx25_init_irq,
diff --cc arch/arm/mach-msm/board-msm7x30.c
index 9043417ea52f,5a2ab6855183..71de5062c71e
--- a/arch/arm/mach-msm/board-msm7x30.c
+++ b/arch/arm/mach-msm/board-msm7x30.c
@@@ -121,9 -106,7 +121,9 @@@ static void __init msm7x30_map_io(void
  }
  
  MACHINE_START(MSM7X30_SURF, "QCT MSM7X30 SURF")
- 	.boot_params = PLAT_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
 +	.fixup = msm7x30_fixup,
 +	.reserve = msm7x30_reserve,
  	.map_io = msm7x30_map_io,
  	.init_irq = msm7x30_init_irq,
  	.init_machine = msm7x30_init,
@@@ -131,9 -114,7 +131,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FFA, "QCT MSM7X30 FFA")
- 	.boot_params = PLAT_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
 +	.fixup = msm7x30_fixup,
 +	.reserve = msm7x30_reserve,
  	.map_io = msm7x30_map_io,
  	.init_irq = msm7x30_init_irq,
  	.init_machine = msm7x30_init,
@@@ -141,9 -122,7 +141,9 @@@
  MACHINE_END
  
  MACHINE_START(MSM7X30_FLUID, "QCT MSM7X30 FLUID")
- 	.boot_params = PLAT_PHYS_OFFSET + 0x100,
+ 	.atag_offset = 0x100,
 +	.fixup = msm7x30_fixup,
 +	.reserve = msm7x30_reserve,
  	.map_io = msm7x30_map_io,
  	.init_irq = msm7x30_init_irq,
  	.init_machine = msm7x30_init,
diff --cc arch/arm/mm/dma-mapping.c
index 4f01bfd6899a,50be842e89fd..66e30534fd25
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@@ -117,14 -119,10 +119,9 @@@ static void __dma_free_buffer(struct pa
  }
  
  #ifdef CONFIG_MMU
- /* Sanity check size */
- #if (CONSISTENT_DMA_SIZE % SZ_2M)
- #error "CONSISTENT_DMA_SIZE must be multiple of 2MiB"
- #endif
  
- #define CONSISTENT_OFFSET(x)	(((unsigned long)(x) - CONSISTENT_BASE) >> PAGE_SHIFT)
- #define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - CONSISTENT_BASE) >> PMD_SHIFT)
- #define NUM_CONSISTENT_PTES (CONSISTENT_DMA_SIZE >> PMD_SHIFT)
 -
+ #define CONSISTENT_OFFSET(x)	(((unsigned long)(x) - consistent_base) >> PAGE_SHIFT)
 -#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - consistent_base) >> PGDIR_SHIFT)
++#define CONSISTENT_PTE_INDEX(x) (((unsigned long)(x) - consistent_base) >> PMD_SHIFT)
  
  /*
   * These are the page tables (2MB each) covering uncached, DMA consistent allocations