Merge remote-tracking branch 'arm-soc/for-next'

Conflicts:
	Documentation/devicetree/bindings/arm/l2cc.txt
	arch/arm/mach-at91/board-usb-a9260.c
	arch/arm/mach-msm/board-msm7x30.c
	arch/arm/mach-msm/board-msm8x60.c
	arch/arm/mach-mxs/include/mach/gpio.h
	arch/arm/mach-nuc93x/Makefile.boot
	arch/arm/mach-u300/Makefile.boot
	arch/arm/mm/cache-l2x0.c
	arch/arm/mm/dma-mapping.c
	arch/arm/plat-mxc/include/mach/gpio.h

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/include/asm/dma-mapping.h
Simple merge

diff --cc arch/arm/include/asm/mach/arch.h
Simple merge

diff --cc arch/arm/include/asm/memory.h
Simple merge

diff --cc arch/arm/kernel/setup.c
Simple merge

diff --cc arch/arm/mach-at91/at91cap9_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91rm9200_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9260_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9261_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9263_devices.c
Simple merge

diff --cc arch/arm/mach-at91/at91sam9g45_devices.c
Simple merge

diff --cc arch/arm/mach-at91/board-usb-a926x.c
Simple merge

diff --cc arch/arm/mach-clps711x/clep7312.c
Simple merge

diff --cc arch/arm/mach-clps711x/edb7211-arch.c
Simple merge

diff --cc arch/arm/mach-clps711x/fortunet.c
Simple merge

diff --cc arch/arm/mach-clps711x/p720t.c
Simple merge

diff --cc arch/arm/mach-davinci/da850.c
Simple merge

diff --cc arch/arm/mach-davinci/dm355.c
Simple merge

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc arch/arm/mach-davinci/dm646x.c
Simple merge

diff --cc arch/arm/mach-exynos4/clock.c
Simple merge

diff --cc arch/arm/mach-footbridge/cats-hw.c
Simple merge

diff --cc arch/arm/mach-footbridge/netwinder-hw.c
Simple merge

diff --cc arch/arm/mach-imx/mach-mx27ads.c
Simple merge

diff --cc arch/arm/mach-integrator/integrator_ap.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/dsmg600-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/fsg-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nas100d-setup.c
Simple merge

diff --cc arch/arm/mach-ixp4xx/nslu2-setup.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-acs5k.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-dsm320.c
Simple merge

diff --cc arch/arm/mach-ks8695/board-micrel.c
Simple merge

diff --cc arch/arm/mach-lpc32xx/phy3250.c
Simple merge

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

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

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

diff --cc arch/arm/mach-msm/board-msm7x30.c
index 9043417ea52fb025f8216f7c11607bf809634c79,5a2ab6855183bfff969b3f84a60934472f1de908..71de5062c71efd6d86e3e5a4e5927e7dbdf733ea
--- 1/arch/arm/mach-msm/board-msm7x30.c
--- 2/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/mach-msm/board-msm8x60.c
index 9221f54778be8a8fbbac896364a7434e3266096a,10fa8f6e32c9fcda9fb18548cec360fed520f385..4ad2afb865066b85b19d4d91428db32e3640fc25
--- 1/arch/arm/mach-msm/board-msm8x60.c
--- 2/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@@ -20,7 -14,10 +14,11 @@@
  #include <linux/platform_device.h>
  #include <linux/io.h>
  #include <linux/irq.h>
 +#include <linux/memblock.h>
+ #include <linux/irqdomain.h>
+ #include <linux/of.h>
+ #include <linux/of_address.h>
+ #include <linux/of_platform.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
@@@ -81,9 -62,42 +79,44 @@@ static void __init msm8x60_init(void
  {
  }
  
+ #ifdef CONFIG_OF
+ static struct of_dev_auxdata msm_auxdata_lookup[] __initdata = {
+       {}
+ };
+ 
+ static struct of_device_id msm_dt_gic_match[] __initdata = {
+       { .compatible = "qcom,msm-8660-qgic", },
+       {}
+ };
+ 
+ static void __init msm8x60_dt_init(void)
+ {
+       struct device_node *node;
+ 
+       node = of_find_matching_node_by_address(NULL, msm_dt_gic_match,
+                       MSM8X60_QGIC_DIST_PHYS);
+       if (node)
+               irq_domain_add_simple(node, GIC_SPI_START);
+ 
+       if (of_machine_is_compatible("qcom,msm8660-surf")) {
+               printk(KERN_INFO "Init surf UART registers\n");
+               msm8x60_init_uart12dm();
+       }
+ 
+       of_platform_populate(NULL, of_default_bus_match_table,
+                       msm_auxdata_lookup, NULL);
+ }
+ 
+ static const char *msm8x60_fluid_match[] __initdata = {
+       "qcom,msm8660-fluid",
+       "qcom,msm8660-surf",
+       NULL
+ };
+ #endif /* CONFIG_OF */
+ 
  MACHINE_START(MSM8X60_RUMI3, "QCT MSM8X60 RUMI3")
 +      .fixup = msm8x60_fixup,
 +      .reserve = msm8x60_reserve,
        .map_io = msm8x60_map_io,
        .init_irq = msm8x60_init_irq,
        .init_machine = msm8x60_init,
@@@ -116,3 -124,14 +149,16 @@@ MACHINE_START(MSM8X60_FFA, "QCT MSM8X6
        .init_machine = msm8x60_init,
        .timer = &msm_timer,
  MACHINE_END
+ 
+ #ifdef CONFIG_OF
+ /* TODO: General device tree support for all MSM. */
+ DT_MACHINE_START(MSM_DT, "Qualcomm MSM (Flattened Device Tree)")
++      .fixup = msm8x60_fixup,
++      .reserve = msm8x60_reserve,
+       .map_io = msm8x60_map_io,
+       .init_irq = msm8x60_init_irq,
+       .init_machine = msm8x60_dt_init,
+       .timer = &msm_timer,
+       .dt_compat = msm8x60_fluid_match,
+ MACHINE_END
+ #endif /* CONFIG_OF */

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

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

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

diff --cc arch/arm/mach-mxs/include/mach/gpio.h
index bb11e63261e491fb36c750787487c23bce2dc313,56025aa0a639ea68d7b523c147004215dc0010cf..01ee648b1c7e1e17aa34ba96bc86ae4eba67bba4
--- 1/arch/arm/mach-mxs/include/mach/gpio.h
--- 2/arch/arm/mach-mxs/include/mach/gpio.h
+++ b/arch/arm/mach-mxs/include/mach/gpio.h
@@@ -20,8 -20,12 +20,4 @@@
  #ifndef __MACH_MXS_GPIO_H__
  #define __MACH_MXS_GPIO_H__
  
- #define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr))
 -#include <asm-generic/gpio.h>
--
- #define irq_to_gpio(irq)      ((irq) - MXS_GPIO_IRQ_START)
 -/* use gpiolib dispatchers */
 -#define gpio_get_value                __gpio_get_value
 -#define gpio_set_value                __gpio_set_value
 -#define gpio_cansleep         __gpio_cansleep
 -#define gpio_to_irq           __gpio_to_irq
--
  #endif /* __MACH_MXS_GPIO_H__ */

diff --cc arch/arm/mach-nomadik/board-nhk8815.c
Simple merge

diff --cc arch/arm/mach-omap1/board-ams-delta.c
Simple merge

diff --cc arch/arm/mach-omap1/board-fsample.c
Simple merge

diff --cc arch/arm/mach-omap1/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-h3.c
Simple merge

diff --cc arch/arm/mach-omap1/board-htcherald.c
Simple merge

diff --cc arch/arm/mach-omap1/board-innovator.c
Simple merge

diff --cc arch/arm/mach-omap1/board-nokia770.c
Simple merge

diff --cc arch/arm/mach-omap1/board-osk.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmte.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmtt.c
Simple merge

diff --cc arch/arm/mach-omap1/board-palmz71.c
Simple merge

diff --cc arch/arm/mach-omap1/board-perseus2.c
Simple merge

diff --cc arch/arm/mach-omap1/board-sx1.c
Simple merge

diff --cc arch/arm/mach-omap1/board-voiceblue.c
Simple merge

diff --cc arch/arm/mach-omap2/board-generic.c
Simple merge

diff --cc arch/arm/mach-omap2/board-h4.c
Simple merge

diff --cc arch/arm/mach-omap2/board-ldp.c
Simple merge

diff --cc arch/arm/mach-orion5x/db88f5281-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/dns323-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/kurobox_pro-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/mv2120-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5181l-ge-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f5182-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/terastation_pro2-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts209-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/ts409-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/wnr854t-setup.c
Simple merge

diff --cc arch/arm/mach-orion5x/wrt350n-v2-setup.c
Simple merge

diff --cc arch/arm/mach-prima2/prima2.c
Simple merge

diff --cc arch/arm/mach-pxa/cm-x300.c
Simple merge

diff --cc arch/arm/mach-pxa/eseries.c
Simple merge

diff --cc arch/arm/mach-pxa/lpd270.c
Simple merge

diff --cc arch/arm/mach-pxa/mainstone.c
Simple merge

diff --cc arch/arm/mach-pxa/saarb.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pb1176.c
Simple merge

diff --cc arch/arm/mach-realview/realview_pbx.c
Simple merge

diff --cc arch/arm/mach-rpc/riscpc.c
Simple merge

diff --cc arch/arm/mach-s3c2412/mach-smdk2413.c
Simple merge

diff --cc arch/arm/mach-s3c2412/mach-vstms.c
Simple merge

diff --cc arch/arm/mach-sa1100/assabet.c
Simple merge

diff --cc arch/arm/mach-sa1100/simpad.c
Simple merge

diff --cc arch/arm/mach-tegra/board-harmony.c
Simple merge

diff --cc arch/arm/mach-tegra/board-paz00.c
Simple merge

diff --cc arch/arm/mach-tegra/board-trimslice.c
Simple merge

diff --cc arch/arm/mach-u300/Kconfig
Simple merge

diff --cc arch/arm/mach-u300/Makefile.boot
index 69357affbd77f9eb2799ee4b16fadbf2b382ae28,a06bb0deadfe2f2a39eeddbc2cd4937184d4b626..87811de0bd947cb4b516f54185e71b745562dc22
--- 1/arch/arm/mach-u300/Makefile.boot
--- 2/arch/arm/mach-u300/Makefile.boot
+++ b/arch/arm/mach-u300/Makefile.boot
@@@ -1,15 -1,4 +1,4 @@@
- # Note: the following conditions must always be true:
- #   ZRELADDR == virt_to_phys(TEXTADDR)
- #   PARAMS_PHYS must be within 4MB of ZRELADDR
- #   INITRD_PHYS must be in RAM
- 
- ifdef CONFIG_MACH_U300_SINGLE_RAM
-      zreladdr-y       += 0x28E08000
-   params_phys-y       := 0x28E00100
- else
-      zreladdr-y       += 0x48008000
-   params_phys-y       := 0x48000100
- endif
- 
 -   zreladdr-y := 0x48008000
++   zreladdr-y += 0x48008000
+ params_phys-y := 0x48000100
  # This isn't used.
- #initrd_phys-y        := 0x29800000
+ #initrd_phys-y        := 0x48800000

diff --cc arch/arm/mach-u300/core.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500-pins.c
Simple merge

diff --cc arch/arm/mach-ux500/board-mop500.c
Simple merge

diff --cc arch/arm/mach-ux500/board-u5500.c
Simple merge

diff --cc arch/arm/mach-vexpress/hotplug.c
index 3668cf91d2dedb0a443d9b2b6f1bff903c411c7d,2866ed8c4b05fd142ef99f49788ed816e7df7ab3..813ee08f96e6a3d7f7052a45be2e92e68e347b3c
--- 1/arch/arm/mach-vexpress/hotplug.c
--- 2/arch/arm/mach-vexpress/hotplug.c
+++ b/arch/arm/mach-vexpress/hotplug.c
@@@ -63,9 -62,15 +63,9 @@@ static inline void platform_do_lowpower
         * code will have already disabled interrupts
         */
        for (;;) {
 -              /*
 -               * here's the WFI
 -               */
 -              asm(".word      0xe320f003\n"
 -                  :
 -                  :
 -                  : "memory", "cc");
 +              wfi();
  
-               if (pen_release == cpu) {
+               if (pen_release == cpu_logical_map(cpu)) {
                        /*
                         * OK, proper wakeup, we're done
                         */

diff --cc arch/arm/mm/dma-mapping.c
index 235eb775fc78284180779d3eed96ccb357f8127c,50be842e89fd06ca43c9dd71a296509ad065bb1b..e4e7f6cba1ab4823fdbf0fe7ab2109bf6df89ed7
--- 1/arch/arm/mm/dma-mapping.c
--- 2/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

diff --cc arch/arm/plat-mxc/include/mach/gpio.h
index 3e1ffc8b8f0c2d56283bdbc92b476bb07f86196d,44af0064ba1a96485d30bece8ee4d3a3183e0369..593ce13adfa7a50c22bbc9e5d67c06e1de96497f
--- 1/arch/arm/plat-mxc/include/mach/gpio.h
--- 2/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@@ -21,13 -21,12 +21,5 @@@
  
  #include <linux/spinlock.h>
  #include <mach/hardware.h>
 -#include <asm-generic/gpio.h>
 -
 -/* use gpiolib dispatchers */
 -#define gpio_get_value                __gpio_get_value
 -#define gpio_set_value                __gpio_set_value
 -#define gpio_cansleep         __gpio_cansleep
 -#define gpio_to_irq           __gpio_to_irq
  
- 
- /* There's a off-by-one betweem the gpio bank number and the gpiochip */
- /* range e.g. GPIO_1_5 is gpio 5 under linux */
- #define IMX_GPIO_NR(bank, nr)         (((bank) - 1) * 32 + (nr))
- 
- #define gpio_to_irq(gpio)     (MXC_GPIO_IRQ_START + (gpio))
- #define irq_to_gpio(irq)      ((irq) - MXC_GPIO_IRQ_START)
- 
  #endif