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

Conflicts:
	arch/arm/mach-exynos/cpu.c
	arch/arm/mach-exynos/include/mach/entry-macro.S
	arch/arm/mach-s3c64xx/mach-crag6410.c

diff --cc arch/arm/mach-exynos/cpu.c
index 6e34485caa3624be8c96af604c2db343e38cae31,8e09f341b2c67f0a9f19d0b12a788d2b37dea00b..fed62f4d01511fc9e1c87031bf2353b722f754c6
--- 1/arch/arm/mach-exynos/cpu.c
--- 2/arch/arm/mach-exynos/cpu.c
+++ b/arch/arm/mach-exynos/cpu.c
@@@ -206,6 -231,24 +230,13 @@@ void __init exynos4_init_clocks(int xta
        exynos4_setup_clocks();
  }
  
 -static void exynos4_gic_irq_fix_base(struct irq_data *d)
 -{
 -      struct gic_chip_data *gic_data = irq_data_get_irq_chip_data(d);
 -
 -      gic_data->cpu_base = S5P_VA_GIC_CPU +
 -                          (gic_bank_offset * smp_processor_id());
 -
 -      gic_data->dist_base = S5P_VA_GIC_DIST +
 -                          (gic_bank_offset * smp_processor_id());
 -}
 -
+ #ifdef CONFIG_OF
+ static const struct of_device_id exynos4_dt_irq_match[] = {
+       { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, },
+       {},
+ };
+ #endif
+ 
  void __init exynos4_init_irq(void)
  {
        int irq;
@@@ -213,8 -255,17 +244,13 @@@
  
        gic_bank_offset = soc_is_exynos4412() ? 0x4000 : 0x8000;
  
-       gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+       if (!of_have_populated_dt())
 -              gic_init(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU);
++              gic_init_bases(0, IRQ_PPI(0), S5P_VA_GIC_DIST, S5P_VA_GIC_CPU, gic_bank_offset);
+ #ifdef CONFIG_OF
+       else
+               of_irq_init(exynos4_dt_irq_match);
+ #endif
  
 -      gic_arch_extn.irq_eoi = exynos4_gic_irq_fix_base;
 -      gic_arch_extn.irq_unmask = exynos4_gic_irq_fix_base;
 -      gic_arch_extn.irq_mask = exynos4_gic_irq_fix_base;
 -
        for (irq = 0; irq < MAX_COMBINER_NR; irq++) {
  
                combiner_init(irq, (void __iomem *)S5P_VA_COMBINER(irq),

diff --cc arch/arm/mach-exynos/mach-origen.c
index 5561b06c38ece1db9acb1e5432894cd0aecac83a,f56d02705e0a4d50706e43568e16f02c4e8562f6..48d157e85ee64cdc052d307c2ebc70803358eace
--- 1/arch/arm/mach-exynos/mach-origen.c
--- 2/arch/arm/mach-exynos/mach-origen.c
+++ b/arch/arm/mach-exynos/mach-origen.c
@@@ -20,9 -20,9 +20,10 @@@
  #include <linux/regulator/machine.h>
  #include <linux/mfd/max8997.h>
  #include <linux/lcd.h>
+ #include <linux/rfkill-gpio.h>
  
  #include <asm/mach/arch.h>
 +#include <asm/hardware/gic.h>
  #include <asm/mach-types.h>
  
  #include <video/platform_lcd.h>

diff --cc arch/arm/mach-s3c64xx/mach-crag6410.c
index 988ac2e48f0818af97e8129e9134ae33d670884b,b2381c1bb3ba25e9403f896462aad9d6d4370e5a..6ff76c0d9d5c90fe2b0a12a4c559b103766aab11
--- 1/arch/arm/mach-s3c64xx/mach-crag6410.c
--- 2/arch/arm/mach-s3c64xx/mach-crag6410.c
+++ b/arch/arm/mach-s3c64xx/mach-crag6410.c
@@@ -37,7 -37,8 +37,9 @@@
  #include <linux/mfd/wm831x/irq.h>
  #include <linux/mfd/wm831x/gpio.h>
  
+ #include <sound/wm1250-ev1.h>
+ 
 +#include <asm/hardware/vic.h>
  #include <asm/mach/arch.h>
  #include <asm/mach-types.h>