Merge remote-tracking branch 'msm/for-next'

Conflicts:
	arch/arm/mach-msm/io.c

diff --cc arch/arm/mach-msm/Makefile
Simple merge

diff --cc arch/arm/mach-msm/acpuclock-arm11.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm7x30.c
Simple merge

diff --cc arch/arm/mach-msm/board-msm8960.c
index b04468e7d00e5b1663c9832bc3f5f5ad51e329b5,8294692c27d78877e3a572407c89833628771988..dab58ef834d7a78b25e66f5c48b74c7dd0301fc0
--- 1/arch/arm/mach-msm/board-msm8960.c
--- 2/arch/arm/mach-msm/board-msm8960.c
+++ b/arch/arm/mach-msm/board-msm8960.c
@@@ -94,18 -92,16 +110,20 @@@ static void __init msm8960_rumi3_init(v
  }
  
  MACHINE_START(MSM8960_SIM, "QCT MSM8960 SIMULATOR")
 +      .fixup = msm8960_fixup,
 +      .reserve = msm8960_reserve,
        .map_io = msm8960_map_io,
+       .init_early = msm8960_init_early,
        .init_irq = msm8960_init_irq,
        .timer = &msm_timer,
        .init_machine = msm8960_sim_init,
  MACHINE_END
  
  MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")
 +      .fixup = msm8960_fixup,
 +      .reserve = msm8960_reserve,
        .map_io = msm8960_map_io,
+       .init_early = msm8960_init_early,
        .init_irq = msm8960_init_irq,
        .timer = &msm_timer,
        .init_machine = msm8960_rumi3_init,

diff --cc arch/arm/mach-msm/board-msm8x60.c
index 9221f54778be8a8fbbac896364a7434e3266096a,98c47ce517fbc1f01987449314eebea0d4d54a1c..5b47ec85aa541d8a0de651365099fd1df90ae3ea
--- 1/arch/arm/mach-msm/board-msm8x60.c
--- 2/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@@ -29,22 -27,8 +29,23 @@@
  
  #include <mach/board.h>
  #include <mach/msm_iomap.h>
+ #include "devices.h"
  
 +static void __init msm8x60_fixup(struct machine_desc *desc, struct tag *tag,
 +                       char **cmdline, struct meminfo *mi)
 +{
 +      for (; tag->hdr.size; tag = tag_next(tag))
 +              if (tag->hdr.tag == ATAG_MEM &&
 +                              tag->u.mem.start == 0x40200000) {
 +                      tag->u.mem.start = 0x40000000;
 +                      tag->u.mem.size += SZ_2M;
 +              }
 +}
 +
 +static void __init msm8x60_reserve(void)
 +{
 +      memblock_remove(0x40000000, SZ_2M);
 +}
  
  static void __init msm8x60_map_io(void)
  {

diff --cc arch/arm/mach-msm/board-qsd8x50.c
Simple merge

diff --cc arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
index 94fe9fe6feb35e207a48b88685f143985d6910d1,d6540e1192eb746a1f254cc960df1b82dc6008bd..04bca831ecb06aa042a325e072cfdd6b6b7135a6
--- 1/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
--- 2/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x00.h
@@@ -51,15 -51,16 +51,14 @@@
  #define MSM7X00_CSR_PHYS      0xC0100000
  #define MSM7X00_CSR_SIZE      SZ_4K
  
- #define MSM_DMOV_BASE         IOMEM(0xE0002000)
- #define MSM_DMOV_PHYS         0xA9700000
- #define MSM_DMOV_SIZE         SZ_4K
+ #define MSM7X00_DMOV_PHYS     0xA9700000
+ #define MSM7X00_DMOV_SIZE     SZ_4K
  
 -#define MSM_GPIO1_BASE        IOMEM(0xE0003000)
 -#define MSM_GPIO1_PHYS        0xA9200000
 -#define MSM_GPIO1_SIZE        SZ_4K
 +#define MSM7X00_GPIO1_PHYS        0xA9200000
 +#define MSM7X00_GPIO1_SIZE        SZ_4K
  
 -#define MSM_GPIO2_BASE        IOMEM(0xE0004000)
 -#define MSM_GPIO2_PHYS        0xA9300000
 -#define MSM_GPIO2_SIZE        SZ_4K
 +#define MSM7X00_GPIO2_PHYS        0xA9300000
 +#define MSM7X00_GPIO2_SIZE        SZ_4K
  
  #define MSM_CLK_CTL_BASE      IOMEM(0xE0005000)
  #define MSM_CLK_CTL_PHYS      0xA8600000

diff --cc arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
index 37694442d1bda079bb1475e71a511cf27ad825f3,23912e541cdb98458bab44bc11cf78cb791d9fb2..7357ed6b116496029622cf74efc290c4d3b9a693
--- 1/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
--- 2/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
@@@ -42,15 -42,16 +42,14 @@@
  #define MSM7X30_CSR_PHYS      0xC0100000
  #define MSM7X30_CSR_SIZE      SZ_4K
  
- #define MSM_DMOV_BASE         IOMEM(0xE0002000)
- #define MSM_DMOV_PHYS         0xAC400000
- #define MSM_DMOV_SIZE         SZ_4K
+ #define MSM7X30_DMOV_PHYS     0xAC400000
+ #define MSM7X30_DMOV_SIZE     SZ_4K
  
 -#define MSM_GPIO1_BASE        IOMEM(0xE0003000)
 -#define MSM_GPIO1_PHYS        0xAC001000
 -#define MSM_GPIO1_SIZE        SZ_4K
 +#define MSM7X30_GPIO1_PHYS        0xAC001000
 +#define MSM7X30_GPIO1_SIZE        SZ_4K
  
 -#define MSM_GPIO2_BASE        IOMEM(0xE0004000)
 -#define MSM_GPIO2_PHYS        0xAC101000
 -#define MSM_GPIO2_SIZE        SZ_4K
 +#define MSM7X30_GPIO2_PHYS        0xAC101000
 +#define MSM7X30_GPIO2_SIZE        SZ_4K
  
  #define MSM_CLK_CTL_BASE      IOMEM(0xE0005000)
  #define MSM_CLK_CTL_PHYS      0xAB800000

diff --cc arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
index d67cd73316f456eaaf7258fc8ea3444ebd884b9d,fc36b82d41b314da7f1166f4596cd4bdb6b02820..38f37ed66c704ca3e1f6093f5a21e145b006f80c
--- 1/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
--- 2/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
@@@ -42,15 -42,16 +42,14 @@@
  #define QSD8X50_CSR_PHYS      0xAC100000
  #define QSD8X50_CSR_SIZE      SZ_4K
  
- #define MSM_DMOV_BASE         IOMEM(0xE0002000)
- #define MSM_DMOV_PHYS         0xA9700000
- #define MSM_DMOV_SIZE         SZ_4K
+ #define QSD8X50_DMOV_PHYS     0xA9700000
+ #define QSD8X50_DMOV_SIZE     SZ_4K
  
 -#define MSM_GPIO1_BASE        IOMEM(0xE0003000)
 -#define MSM_GPIO1_PHYS        0xA9000000
 -#define MSM_GPIO1_SIZE        SZ_4K
 +#define QSD8X50_GPIO1_PHYS        0xA9000000
 +#define QSD8X50_GPIO1_SIZE        SZ_4K
  
 -#define MSM_GPIO2_BASE        IOMEM(0xE0004000)
 -#define MSM_GPIO2_PHYS        0xA9100000
 -#define MSM_GPIO2_SIZE        SZ_4K
 +#define QSD8X50_GPIO2_PHYS        0xA9100000
 +#define QSD8X50_GPIO2_SIZE        SZ_4K
  
  #define MSM_CLK_CTL_BASE      IOMEM(0xE0005000)
  #define MSM_CLK_CTL_PHYS      0xA8600000

diff --cc arch/arm/mach-msm/io.c
index 140ddbbc3a8a5509ddbabb6520bb1605ae038d70,1c86cda45d3b894be0d15f4d92fc5b72555a94f9..067653a11fbb6f8d34092f4bda416a3781f02ee7
--- 1/arch/arm/mach-msm/io.c
--- 2/arch/arm/mach-msm/io.c
+++ b/arch/arm/mach-msm/io.c
@@@ -42,9 -42,8 +42,8 @@@
  static struct map_desc msm_io_desc[] __initdata = {
        MSM_DEVICE(VIC),
        MSM_CHIP_DEVICE(CSR, MSM7X00),
-       MSM_DEVICE(DMOV),
 -      MSM_DEVICE(GPIO1),
 -      MSM_DEVICE(GPIO2),
 +      MSM_CHIP_DEVICE(GPIO1, MSM7X00),
 +      MSM_CHIP_DEVICE(GPIO2, MSM7X00),
        MSM_DEVICE(CLK_CTL),
  #ifdef CONFIG_MSM_DEBUG_UART
        MSM_DEVICE(DEBUG_UART),
@@@ -75,9 -74,8 +74,8 @@@ void __init msm_map_common_io(void
  static struct map_desc qsd8x50_io_desc[] __initdata = {
        MSM_DEVICE(VIC),
        MSM_CHIP_DEVICE(CSR, QSD8X50),
-       MSM_DEVICE(DMOV),
 -      MSM_DEVICE(GPIO1),
 -      MSM_DEVICE(GPIO2),
 +      MSM_CHIP_DEVICE(GPIO1, QSD8X50),
 +      MSM_CHIP_DEVICE(GPIO2, QSD8X50),
        MSM_DEVICE(CLK_CTL),
        MSM_DEVICE(SIRC),
        MSM_DEVICE(SCPLL),
@@@ -134,9 -132,8 +132,8 @@@ void __init msm_map_msm8960_io(void
  static struct map_desc msm7x30_io_desc[] __initdata = {
        MSM_DEVICE(VIC),
        MSM_CHIP_DEVICE(CSR, MSM7X30),
-       MSM_DEVICE(DMOV),
 -      MSM_DEVICE(GPIO1),
 -      MSM_DEVICE(GPIO2),
 +      MSM_CHIP_DEVICE(GPIO1, MSM7X30),
 +      MSM_CHIP_DEVICE(GPIO2, MSM7X30),
        MSM_DEVICE(CLK_CTL),
        MSM_DEVICE(CLK_CTL_SH2),
        MSM_DEVICE(AD5),